From a1e68f88a5f3f7c14f1e2045074550933bcaf0fb Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Mon, 21 Nov 2022 13:30:26 +1100
Subject: [PATCH] - Duke: Remove `player_struct::posAdd()`.

---
 source/games/duke/src/actors.cpp    | 6 +++---
 source/games/duke/src/types.h       | 8 --------
 source/games/duke/src/vmexports.cpp | 2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp
index d8e4fcb0f..4634d645a 100644
--- a/source/games/duke/src/actors.cpp
+++ b/source/games/duke/src/actors.cpp
@@ -2200,7 +2200,7 @@ void handle_se30(DDukeActor *actor, int JIBS6)
 			auto psp = ps[p].GetActor();
 			if (psp->sector() == actor->sector())
 			{
-				ps[p].posAdd(vect);
+				ps[p].GetActor()->spr.pos.XY() += vect;
 
 				if (numplayers > 1)
 				{
@@ -2327,7 +2327,7 @@ void handle_se02(DDukeActor* actor)
 		for (int p = connecthead; p >= 0; p = connectpoint2[p])
 			if (ps[p].cursector == actor->sector() && ps[p].on_ground)
 			{
-				ps[p].posAdd(vect);
+				ps[p].GetActor()->spr.pos.XY() += vect;
 				ps[p].bobpos += vect;
 			}
 
@@ -3337,7 +3337,7 @@ void handle_se20(DDukeActor* actor)
 		for (int p = connecthead; p >= 0; p = connectpoint2[p])
 			if (ps[p].cursector == actor->sector() && ps[p].on_ground)
 			{
-				ps[p].posAdd(vec);
+				ps[p].GetActor()->spr.pos.XY() += vec;
 				ps[p].GetActor()->backupvec2();
 
 				SetActor(ps[p].GetActor(), ps[p].GetActor()->spr.pos);
diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h
index ed319fcf4..455925c82 100644
--- a/source/games/duke/src/types.h
+++ b/source/games/duke/src/types.h
@@ -340,14 +340,6 @@ struct player_struct
 	{
 		GetActor()->spr.pos = val.plusZ(-GetActor()->viewzoffset);
 	}
-	void posAdd(const DVector3& val)
-	{
-		GetActor()->spr.pos += val;
-	}
-	void posAdd(const DVector2& val)
-	{
-		GetActor()->spr.pos.XY() += val;
-	}
 
 	double& posoldX()
 	{
diff --git a/source/games/duke/src/vmexports.cpp b/source/games/duke/src/vmexports.cpp
index 61bebda32..ecddcacbf 100644
--- a/source/games/duke/src/vmexports.cpp
+++ b/source/games/duke/src/vmexports.cpp
@@ -717,7 +717,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(_DukePlayer, setpos, dukeplayer_setpos)
 
 void dukeplayer_addpos(player_struct* self, double x, double y, double z)
 {
-	self->posAdd({ x, y, z });
+	self->GetActor()->spr.pos += { x, y, z };
 }
 
 DEFINE_ACTION_FUNCTION_NATIVE(_DukePlayer, addpos, dukeplayer_addpos)