From 4551274e7dc1e2e86625965a4e6f3081a22d3f14 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Mon, 21 Nov 2022 13:39:48 +1100
Subject: [PATCH] - Duke: Remove `player_struct::posSet()`.

---
 source/games/duke/src/actors.cpp    | 2 +-
 source/games/duke/src/actors_r.cpp  | 2 +-
 source/games/duke/src/player_d.cpp  | 4 ++--
 source/games/duke/src/player_r.cpp  | 4 ++--
 source/games/duke/src/types.h       | 5 -----
 source/games/duke/src/vmexports.cpp | 2 +-
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp
index 4634d645a..77ff79d0b 100644
--- a/source/games/duke/src/actors.cpp
+++ b/source/games/duke/src/actors.cpp
@@ -457,7 +457,7 @@ void moveplayers(void)
 				}
 				else
 				{
-					p->posSet(act->spr.pos.plusZ(-20));
+					p->GetActor()->spr.pos.Z += 20;
 					p->newOwner = nullptr;
 
 					if (p->wackedbyactor != nullptr && p->wackedbyactor->spr.statnum < MAXSTATUS)
diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp
index 6f01e650c..26c9b6592 100644
--- a/source/games/duke/src/actors_r.cpp
+++ b/source/games/duke/src/actors_r.cpp
@@ -2046,7 +2046,7 @@ void rr_specialstats()
 					if (act2->spr.picnum == RRTELEPORTDEST)
 					{
 						ps[p].angle.ang = act2->spr.angle;
-						ps[p].posSet(act2->spr.pos.plusZ(-36));
+						ps[p].GetActor()->spr.pos = act2->spr.pos.plusZ(-36 + gs.playerheight);
 						ps[p].GetActor()->backuppos();
 						ps[p].setbobpos();
 						auto pact = ps[p].GetActor();
diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp
index 9765c0de7..805b06135 100644
--- a/source/games/duke/src/player_d.cpp
+++ b/source/games/duke/src/player_d.cpp
@@ -2860,7 +2860,7 @@ void processinput_d(int snum)
 
 	checklook(snum,actions);
 	double iif = 2.5;
-	auto oldpos = p->posoldGet();
+	auto oldpos = p->GetActor()->opos;
 
 	if (p->on_crane != nullptr)
 		goto HORIZONLY;
@@ -3101,7 +3101,7 @@ HORIZONLY:
 			{
 				if (!retry++)
 				{
-					p->posSet(oldpos);
+					p->GetActor()->spr.pos = oldpos;
 					p->GetActor()->backuppos();
 					continue;
 				}
diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp
index 5a84040d2..6e76b77a0 100644
--- a/source/games/duke/src/player_r.cpp
+++ b/source/games/duke/src/player_r.cpp
@@ -3525,7 +3525,7 @@ void processinput_r(int snum)
 	checklook(snum, actions);
 	p->apply_seasick(1);
 
-	auto oldpos = p->posoldGet();
+	auto oldpos = p->GetActor()->opos;
 
 	if (p->on_crane != nullptr)
 		goto HORIZONLY;
@@ -3888,7 +3888,7 @@ HORIZONLY:
 			{
 				if (!retry++)
 				{
-					p->posSet(oldpos);
+					p->GetActor()->spr.pos = oldpos;
 					p->GetActor()->backuppos();
 					continue;
 				}
diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h
index 455925c82..32bd693a0 100644
--- a/source/games/duke/src/types.h
+++ b/source/games/duke/src/types.h
@@ -336,11 +336,6 @@ struct player_struct
 	}
 
 
-	void posSet(const DVector3& val)
-	{
-		GetActor()->spr.pos = val.plusZ(-GetActor()->viewzoffset);
-	}
-
 	double& posoldX()
 	{
 		return GetActor()->opos.X;
diff --git a/source/games/duke/src/vmexports.cpp b/source/games/duke/src/vmexports.cpp
index ecddcacbf..b8f2ffd98 100644
--- a/source/games/duke/src/vmexports.cpp
+++ b/source/games/duke/src/vmexports.cpp
@@ -702,7 +702,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(_DukePlayer, backupxyz, dukeplayer_backupxyz)
 
 void dukeplayer_setpos(player_struct* self, double x, double y, double z)
 {
-	self->posSet({ x, y, z });
+	self->GetActor()->spr.pos = { x, y, z + self->GetActor()->viewzoffset };
 }
 
 DEFINE_ACTION_FUNCTION_NATIVE(_DukePlayer, setpos, dukeplayer_setpos)