From 07826c77914f25a7f1be0b0ca296378c09a97dc5 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 29 Aug 2022 19:27:52 +0200
Subject: [PATCH] - eliminated DCoreActor::copyXY

---
 source/core/coreactor.h             | 6 ------
 source/games/blood/src/nnexts.cpp   | 2 +-
 source/games/blood/src/osdcmd.cpp   | 2 +-
 source/games/duke/src/actors.cpp    | 2 +-
 source/games/duke/src/spawn.cpp     | 2 +-
 source/games/exhumed/src/object.cpp | 2 +-
 source/games/exhumed/src/player.cpp | 2 +-
 source/games/sw/src/bunny.cpp       | 2 +-
 source/games/sw/src/jweapon.cpp     | 2 +-
 9 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/source/core/coreactor.h b/source/core/coreactor.h
index 7abb00a38..924a44daa 100644
--- a/source/core/coreactor.h
+++ b/source/core/coreactor.h
@@ -96,12 +96,6 @@ public:
 		spr.pos = { add.X* inttoworld, add.Y* inttoworld, add.Z* zinttoworld };
 	}
 
-	void copyXY(DCoreActor* other)
-	{
-		spr.pos.X = other->spr.pos.X;
-		spr.pos.Y = other->spr.pos.Y;
-	}
-
 	void set_int_xy(int x, int y)
 	{
 		spr.pos.X = x * inttoworld;
diff --git a/source/games/blood/src/nnexts.cpp b/source/games/blood/src/nnexts.cpp
index 504fd17b5..c33a05484 100644
--- a/source/games/blood/src/nnexts.cpp
+++ b/source/games/blood/src/nnexts.cpp
@@ -3182,7 +3182,7 @@ void useTeleportTarget(DBloodActor* sourceactor, DBloodActor* actor)
 	if (actor->sector() != sourceactor->sector())
 		ChangeActorSect(actor, sourceactor->sector());
 
-	actor->copyXY(sourceactor);
+	actor->spr.pos.XY() =sourceactor->spr.pos.XY();
 	int zTop, zBot;
 	GetActorExtents(sourceactor, &zTop, &zBot);
 	actor->set_int_z(zBot);
diff --git a/source/games/blood/src/osdcmd.cpp b/source/games/blood/src/osdcmd.cpp
index 3d6ef9709..29a305df9 100644
--- a/source/games/blood/src/osdcmd.cpp
+++ b/source/games/blood/src/osdcmd.cpp
@@ -36,7 +36,7 @@ void GameInterface::WarpToCoords(int x, int y, int z, int ang, int horz)
 	PLAYER* pPlayer = &gPlayer[myconnectindex];
 	VIEW* pView = &gPrevView[myconnectindex];
 
-	pPlayer->actor->copyXY(gView->actor);
+	pPlayer->actor->spr.pos.XY() = gView->actor->spr.pos.XY();
 	pView->x = gView->actor->int_pos().X;
 	pView->y = gView->actor->int_pos().Y;
 	pPlayer->zView = pView->viewz = gView->zView = z;
diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp
index 16d139fa5..3ee6f7c07 100644
--- a/source/games/duke/src/actors.cpp
+++ b/source/games/duke/src/actors.cpp
@@ -2648,7 +2648,7 @@ void handle_se00(DDukeActor* actor)
 		if (actor->temp_data[3] == 0)
 			actor->temp_data[3] = ldist(actor, Owner);
 		actor->spr.xvel = actor->temp_data[3];
-		actor->copyXY(Owner);
+		actor->spr.pos.XY() = Owner->spr.pos.XY();
 		actor->add_int_ang((l * q));
 		actor->temp_data[2] += (l * q);
 	}
diff --git a/source/games/duke/src/spawn.cpp b/source/games/duke/src/spawn.cpp
index b3148a22d..13f920299 100644
--- a/source/games/duke/src/spawn.cpp
+++ b/source/games/duke/src/spawn.cpp
@@ -933,7 +933,7 @@ void spawneffector(DDukeActor* actor, TArray<DDukeActor*>* actors)
 						{
 							if (actor->int_ang() == 512)
 							{
-								actor->copyXY(act2);
+								actor->spr.pos.XY() = act2->spr.pos.XY();
 							}
 							found = true;
 							actor->SetOwner(act2);
diff --git a/source/games/exhumed/src/object.cpp b/source/games/exhumed/src/object.cpp
index c4a60a704..2a27b53e2 100644
--- a/source/games/exhumed/src/object.cpp
+++ b/source/games/exhumed/src/object.cpp
@@ -1353,7 +1353,7 @@ DExhumedActor* BuildSpark(DExhumedActor* pActor, int nVal)
 {
     auto pSpark = insertActor(pActor->sector(), 0);
 
-    pSpark->copyXY(pActor);
+    pSpark->spr.pos.XY() = pActor->spr.pos.XY();
     pSpark->spr.cstat = 0;
     pSpark->spr.shade = -127;
     pSpark->spr.pal = 1;
diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp
index 6746dfd53..30a6306c9 100644
--- a/source/games/exhumed/src/player.cpp
+++ b/source/games/exhumed/src/player.cpp
@@ -1247,7 +1247,7 @@ sectdone:
         DExhumedActor* pFloorActor = PlayerList[nPlayer].pPlayerFloorSprite;
         if (nTotalPlayers > 1 && pFloorActor)
         {
-            pFloorActor->copyXY(pPlayerActor);
+            pFloorActor->spr.pos.XY() = pPlayerActor->spr.pos.XY();
 
             if (pFloorActor->sector() != pPlayerActor->sector())
             {
diff --git a/source/games/sw/src/bunny.cpp b/source/games/sw/src/bunny.cpp
index 3d850a0ec..38bef00d8 100644
--- a/source/games/sw/src/bunny.cpp
+++ b/source/games/sw/src/bunny.cpp
@@ -1022,7 +1022,7 @@ int DoBunnyQuickJump(DSWActor* actor)
                     }
                 }
 
-                actor->copyXY(hitActor);
+                actor->spr.pos.XY() = hitActor->spr.pos.XY();
                 actor->spr.angle = hitActor->spr.angle;
                 actor->spr.angle += DAngle180;
                 HelpMissileLateral(actor, 2000);
diff --git a/source/games/sw/src/jweapon.cpp b/source/games/sw/src/jweapon.cpp
index f3020e432..216341d05 100644
--- a/source/games/sw/src/jweapon.cpp
+++ b/source/games/sw/src/jweapon.cpp
@@ -444,7 +444,7 @@ int DoBloodSpray(DSWActor* actor)
 
                 actor->spr.xvel = actor->spr.yvel = actor->user.change.X = actor->user.change.Y = 0;
                 actor->spr.xrepeat = actor->spr.yrepeat = 70 - RandomRange(25);
-                actor->copyXY(bldActor);
+                actor->spr.pos.XY() = bldActor->spr.pos.XY();
 
                 // !FRANK! bit of a hack
                 // yvel is the hit_wall