From 0fdc91904d6c105888bfddf86ff508ff37d87541 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 16 Sep 2022 18:06:35 +0200
Subject: [PATCH] - replaced getposfromactor

---
 source/games/duke/src/actors_d.cpp | 2 +-
 source/games/duke/src/actors_r.cpp | 4 ++--
 source/games/duke/src/premap.cpp   | 2 +-
 source/games/duke/src/types.h      | 6 ------
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp
index 0eba74741..dfee59412 100644
--- a/source/games/duke/src/actors_d.cpp
+++ b/source/games/duke/src/actors_d.cpp
@@ -1796,7 +1796,7 @@ void movetransports_d(void)
 								ps[p].transporter_hold = 13;
 							}
 
-							ps[p].getposfromactor(Owner, -gs.playerheight);
+							ps[p].pos = Owner->spr.pos.plusZ(-gs.playerheight);
 							ps[p].backupxyz();
 							ps[p].setbobpos();
 
diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp
index 684a46bf8..67f2132c2 100644
--- a/source/games/duke/src/actors_r.cpp
+++ b/source/games/duke/src/actors_r.cpp
@@ -1443,7 +1443,7 @@ void movetransports_r(void)
 								ps[p].transporter_hold = 13;
 							}
 
-							ps[p].getposfromactor(Owner, -gs.playerheight + 4);
+							ps[p].pos = Owner->spr.pos.plusZ(-gs.playerheight + 4);
 							ps[p].backupxyz();
 							ps[p].setbobpos();
 
@@ -2271,7 +2271,7 @@ void rr_specialstats()
 					if (act2->spr.picnum == RRTILE297)
 					{
 						ps[p].angle.ang = act2->spr.angle;
-						ps[p].getposfromactor(act2, -36);
+						ps[p].pos = act2->spr.pos.plusZ(-36);
 						ps[p].backupxyz();
 						ps[p].setbobpos();
 						auto pact = ps[p].GetActor();
diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp
index 3a75e38c2..6ef174016 100644
--- a/source/games/duke/src/premap.cpp
+++ b/source/games/duke/src/premap.cpp
@@ -648,7 +648,7 @@ void resetpspritevars(int g)
 			ps[j].frag_ps = j;
 			act->SetOwner(act);
 
-			ps[j].getposfromactor(act);
+			ps[j].pos = act->spr.pos;
 			ps[j].backupxyz();
 			ps[j].setbobpos();
 			act->backuppos();
diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h
index ee0b7ab94..ead01f180 100644
--- a/source/games/duke/src/types.h
+++ b/source/games/duke/src/types.h
@@ -375,12 +375,6 @@ struct player_struct
 	{
 		bobpos = pos.XY();
 	}
-
-	void getposfromactor(DCoreActor* actor, double addz = 0)
-	{
-		pos = actor->spr.pos;
-		if (addz) pos.Z  += addz;
-	}
 };
 
 struct Cycler