From f5dd8ba3b917334297a54b0b158e331238a0e015 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Thu, 30 Dec 2021 22:20:32 +1100
Subject: [PATCH] - Duke: Replace `player_orig` `oy` with `opos.Y` calls.

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

diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp
index f3cf8e7d3..300a1212e 100644
--- a/source/games/duke/src/actors.cpp
+++ b/source/games/duke/src/actors.cpp
@@ -2861,7 +2861,7 @@ void handle_se14(DDukeActor* actor, bool checkstat, int RPG, int JIBS6)
 				if (po[p].os == actor->spr.sector())
 				{
 					po[p].opos.X += m;
-					po[p].oy += x;
+					po[p].opos.Y += x;
 				}
 
 				if (actor->spr.sector() == psp->spr.sector())
@@ -3053,7 +3053,7 @@ void handle_se30(DDukeActor *actor, int JIBS6)
 			if (po[p].os == actor->spr.sector())
 			{
 				po[p].opos.X += l;
-				po[p].oy += x;
+				po[p].opos.Y += x;
 			}
 		}
 
diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp
index 848334106..ef1509c31 100644
--- a/source/games/duke/src/premap.cpp
+++ b/source/games/duke/src/premap.cpp
@@ -61,7 +61,7 @@ void pickrandomspot(int snum)
 	else i = snum;
 
 	p->bobposx = p->opos.X = p->pos.X = po[i].opos.X;
-	p->bobposy = p->opos.Y = p->pos.Y = po[i].oy;
+	p->bobposy = p->opos.Y = p->pos.Y = po[i].opos.Y;
 	p->opos.Z = p->pos.Z = po[i].oz;
 	p->angle.oang = p->angle.ang = buildang(po[i].oa);
 	p->setCursector(po[i].os);
@@ -582,7 +582,7 @@ void resetpspritevars(int g)
 		}
 
 		po[numplayersprites].opos.X = act->spr.pos.X;
-		po[numplayersprites].oy = act->spr.pos.Y;
+		po[numplayersprites].opos.Y = act->spr.pos.Y;
 		po[numplayersprites].oz = act->spr.pos.Z;
 		po[numplayersprites].oa = act->spr.ang;
 		po[numplayersprites].os = act->spr.sector();
diff --git a/source/games/duke/src/savegame.cpp b/source/games/duke/src/savegame.cpp
index 424c25b0d..c75e49a3d 100644
--- a/source/games/duke/src/savegame.cpp
+++ b/source/games/duke/src/savegame.cpp
@@ -94,7 +94,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, player_orig& w, pl
 	if (arc.BeginObject(keyname))
 	{
 	  arc("ox", w.opos.X)
-		("oy", w.oy)
+		("oy", w.opos.Y)
 		("oz", w.oz)
 		("oa", w.oa)
 		("os", w.os)
diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h
index 8f3f3b5af..a7c5d52b9 100644
--- a/source/games/duke/src/types.h
+++ b/source/games/duke/src/types.h
@@ -157,7 +157,7 @@ struct user_defs
 struct player_orig
 {
 	vec3_t opos;
-	int oy, oz;
+	int oz;
 	short oa;
 	sectortype* os;
 };