From 3dfcbafd93cba92c27c79632e61048fb719a9b0f Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Thu, 30 Dec 2021 22:28:48 +1100
Subject: [PATCH] - Duke: Replace `CraneDef` `y` with `pos.Y` 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      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp
index 7094d3b94..13406915c 100644
--- a/source/games/duke/src/actors.cpp
+++ b/source/games/duke/src/actors.cpp
@@ -757,9 +757,9 @@ void movecrane(DDukeActor *actor, int crane)
 	{
 		if (actor->spr.xvel < 192)
 			actor->spr.xvel += 8;
-		actor->spr.ang = getangle(cpt.pos.X - actor->spr.pos.X, cpt.y - actor->spr.pos.Y);
+		actor->spr.ang = getangle(cpt.pos.X - actor->spr.pos.X, cpt.pos.Y - actor->spr.pos.Y);
 		ssp(actor, CLIPMASK0);
-		if (((actor->spr.pos.X - cpt.pos.X) * (actor->spr.pos.X - cpt.pos.X) + (actor->spr.pos.Y - cpt.y) * (actor->spr.pos.Y - cpt.y)) < (128 * 128))
+		if (((actor->spr.pos.X - cpt.pos.X) * (actor->spr.pos.X - cpt.pos.X) + (actor->spr.pos.Y - cpt.pos.Y) * (actor->spr.pos.Y - cpt.pos.Y)) < (128 * 128))
 			actor->temp_data[0]++;
 	}
 
diff --git a/source/games/duke/src/savegame.cpp b/source/games/duke/src/savegame.cpp
index 5c66751e0..b3b6fba72 100644
--- a/source/games/duke/src/savegame.cpp
+++ b/source/games/duke/src/savegame.cpp
@@ -68,7 +68,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, CraneDef& w, Crane
 	if (arc.BeginObject(keyname))
 	{
 		arc("x", w.pos.X)
-			("y", w.y)
+			("y", w.pos.Y)
 			("z", w.z)
 			("polex", w.polex)
 			("poley", w.poley)
diff --git a/source/games/duke/src/spawn.cpp b/source/games/duke/src/spawn.cpp
index a9ff2f75c..9cde1b12d 100644
--- a/source/games/duke/src/spawn.cpp
+++ b/source/games/duke/src/spawn.cpp
@@ -483,7 +483,7 @@ void initcrane(DDukeActor* actj, DDukeActor* act, int CRANEPOLE)
 
 	auto& apt = cranes[act->temp_data[4]];
 	apt.pos.X = act->spr.pos.X;
-	apt.y = act->spr.pos.Y;
+	apt.pos.Y = act->spr.pos.Y;
 	apt.z = act->spr.pos.Z;
 	apt.poleactor = nullptr;
 
diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h
index 2d5dd5aac..1385843c4 100644
--- a/source/games/duke/src/types.h
+++ b/source/games/duke/src/types.h
@@ -164,7 +164,7 @@ struct player_orig
 struct CraneDef
 {
 	vec3_t pos;
-	int y, z;
+	int pos.Y, z;
 	int polex, poley;
 	TObjPtr<DDukeActor*> poleactor;
 };