From 034727d9020caa522212ae52db9e3471016af41b Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Thu, 30 Dec 2021 22:30:47 +1100
Subject: [PATCH] - Duke: Replace `CraneDef` `polex` with `pole.X` calls.

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

diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp
index 9dc9bafe7..da8f4e865 100644
--- a/source/games/duke/src/actors.cpp
+++ b/source/games/duke/src/actors.cpp
@@ -648,8 +648,8 @@ void movecrane(DDukeActor *actor, int crane)
 			case STAT_ZOMBIEACTOR:
 			case STAT_STANDABLE:
 			case STAT_PLAYER:
-				actor->spr.ang = getangle(cpt.polex - actor->spr.pos.X, cpt.poley - actor->spr.pos.Y);
-				SetActor(a2, { cpt.polex, cpt.poley, a2->spr.pos.Z });
+				actor->spr.ang = getangle(cpt.pole.X - actor->spr.pos.X, cpt.poley - actor->spr.pos.Y);
+				SetActor(a2, { cpt.pole.X, cpt.poley, a2->spr.pos.Z });
 				actor->temp_data[0]++;
 				return;
 			}
diff --git a/source/games/duke/src/savegame.cpp b/source/games/duke/src/savegame.cpp
index 034e8f40a..3749eb990 100644
--- a/source/games/duke/src/savegame.cpp
+++ b/source/games/duke/src/savegame.cpp
@@ -70,7 +70,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, CraneDef& w, Crane
 		arc("x", w.pos.X)
 			("y", w.pos.Y)
 			("z", w.pos.Z)
-			("polex", w.polex)
+			("polex", w.pole.X)
 			("poley", w.poley)
 			("pole", w.poleactor)
 			.EndObject();
diff --git a/source/games/duke/src/spawn.cpp b/source/games/duke/src/spawn.cpp
index da4e15666..6c04eb18c 100644
--- a/source/games/duke/src/spawn.cpp
+++ b/source/games/duke/src/spawn.cpp
@@ -499,7 +499,7 @@ void initcrane(DDukeActor* actj, DDukeActor* act, int CRANEPOLE)
 			actk->spr.xrepeat = 48;
 			actk->spr.yrepeat = 128;
 
-			apt.polex = actk->spr.pos.X;
+			apt.pole.X = actk->spr.pos.X;
 			apt.poley = actk->spr.pos.Y;
 
 			actk->spr.pos = act->spr.pos;
diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h
index 0b1066344..9d7f49d7c 100644
--- a/source/games/duke/src/types.h
+++ b/source/games/duke/src/types.h
@@ -164,7 +164,8 @@ struct player_orig
 struct CraneDef
 {
 	vec3_t pos;
-	int polex, poley;
+	vec2_t pole;
+	int pole.X, poley;
 	TObjPtr<DDukeActor*> poleactor;
 };