From e0fb92bb01e5cbfaeba774c5e7f45091c27cad4a Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Wed, 22 Dec 2021 22:31:46 +1100
Subject: [PATCH] - Replace `spritetypebase` `ox` with `opos.X` calls.

---
 source/core/maptypes.h               | 4 ++--
 source/games/blood/src/_polymost.cpp | 2 +-
 source/games/duke/src/actors_d.cpp   | 2 +-
 source/games/duke/src/actors_r.cpp   | 2 +-
 source/games/duke/src/gameexec.cpp   | 4 ++--
 source/games/exhumed/src/osdcmds.cpp | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/core/maptypes.h b/source/core/maptypes.h
index d0d40b367..276159bae 100644
--- a/source/core/maptypes.h
+++ b/source/core/maptypes.h
@@ -383,7 +383,7 @@ struct spritetypebase
 	// todo: get rid of the single variables!
 	vec3_t pos;
 	union {
-		struct { int32_t ox, oy, oz; };
+		struct { int32_t BLAHBLAHX, oy, oz; };
 		vec3_t opos;
 	};
 	
@@ -423,7 +423,7 @@ struct spritetypebase
 
 	int32_t interpolatedx(double const smoothratio, int const scale = 16)
 	{
-		return interpolatedvalue(ox, pos.X, smoothratio, scale);
+		return interpolatedvalue(BLAHBLAHX, pos.X, smoothratio, scale);
 	}
 
 	int32_t interpolatedy(double const smoothratio, int const scale = 16)
diff --git a/source/games/blood/src/_polymost.cpp b/source/games/blood/src/_polymost.cpp
index 91a6fb0e8..1ad27d444 100644
--- a/source/games/blood/src/_polymost.cpp
+++ b/source/games/blood/src/_polymost.cpp
@@ -51,7 +51,7 @@ void collectTSpritesForPortal(int x, int y, int i, int interpolation)
                 pTSprite->statnum = kStatDecoration;
                 pTSprite->ownerActor = actor;
                 pTSprite->flags = pSprite->hitag | 0x200;
-                pTSprite->pos.X = dx + interpolatedvalue(pSprite->ox, pSprite->pos.X, interpolation);
+                pTSprite->pos.X = dx + interpolatedvalue(pSprite->opos.X, pSprite->pos.X, interpolation);
                 pTSprite->pos.Y = dy + interpolatedvalue(pSprite->oy, pSprite->pos.Y, interpolation);
                 pTSprite->pos.Z = dz + interpolatedvalue(pSprite->oz, pSprite->pos.Z, interpolation);
                 pTSprite->ang = pSprite->interpolatedang(interpolation);
diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp
index 9f068edb9..9f458e4da 100644
--- a/source/games/duke/src/actors_d.cpp
+++ b/source/games/duke/src/actors_d.cpp
@@ -3727,7 +3727,7 @@ void move_d(DDukeActor *actor, int playernum, int xvel)
 
 	if (t[1] == 0 || a == 0)
 	{
-		if ((badguy(actor) && actor->spr.extra <= 0) || (actor->spr.ox != actor->spr.pos.X) || (actor->spr.oy != actor->spr.pos.Y))
+		if ((badguy(actor) && actor->spr.extra <= 0) || (actor->spr.opos.X != actor->spr.pos.X) || (actor->spr.oy != actor->spr.pos.Y))
 		{
 			actor->spr.backupvec2();
 			SetActor(actor, actor->spr.pos);
diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp
index 003717828..cc9f7c48a 100644
--- a/source/games/duke/src/actors_r.cpp
+++ b/source/games/duke/src/actors_r.cpp
@@ -3763,7 +3763,7 @@ void move_r(DDukeActor *actor, int pnum, int xvel)
 
 	if (t[1] == 0 || a == 0)
 	{
-		if ((badguy(actor) && actor->spr.extra <= 0) || (actor->spr.ox != actor->spr.pos.X) || (actor->spr.oy != actor->spr.pos.Y))
+		if ((badguy(actor) && actor->spr.extra <= 0) || (actor->spr.opos.X != actor->spr.pos.X) || (actor->spr.oy != actor->spr.pos.Y))
 		{
 			actor->spr.backupvec2();
 			SetActor(actor, actor->spr.pos);
diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/gameexec.cpp
index 262087be9..d820ac17e 100644
--- a/source/games/duke/src/gameexec.cpp
+++ b/source/games/duke/src/gameexec.cpp
@@ -1329,8 +1329,8 @@ void DoActor(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor,
 		else SetGameVarID(lVar2, act->lastvy, sActor, sPlayer);
 		break;
 	case ACTOR_HTBPOSX:
-		if (bSet) act->spr.ox = lValue;
-		else SetGameVarID(lVar2, act->spr.ox, sActor, sPlayer);
+		if (bSet) act->spr.opos.X = lValue;
+		else SetGameVarID(lVar2, act->spr.opos.X, sActor, sPlayer);
 		break;
 	case ACTOR_HTBPOSY:
 		if (bSet) act->spr.oy = lValue;
diff --git a/source/games/exhumed/src/osdcmds.cpp b/source/games/exhumed/src/osdcmds.cpp
index 0eef96f4b..a685eb517 100644
--- a/source/games/exhumed/src/osdcmds.cpp
+++ b/source/games/exhumed/src/osdcmds.cpp
@@ -38,7 +38,7 @@ void GameInterface::WarpToCoords(int x, int y, int z, int ang, int horz)
     Player     *nPlayer = &PlayerList[nLocalPlayer];
     spritetype *pSprite = &nPlayer->Actor()->s(); 
 
-    pSprite->ox = pSprite->pos.X = x;
+    pSprite->opos.X = pSprite->pos.X = x;
     pSprite->oy = pSprite->pos.Y = y;
     pSprite->oz = pSprite->pos.Z = z;