From 3a0ec29c183d94f2be2f711ace0728f7fea22b6e Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Fri, 25 Nov 2022 16:27:55 +1100
Subject: [PATCH] - Rename `PlayerAngle::olook_ang` in preparation for
 replacement work.

---
 source/core/gameinput.cpp        |  2 +-
 source/core/gameinput.h          | 10 +++++-----
 source/games/duke/src/premap.cpp |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/core/gameinput.cpp b/source/core/gameinput.cpp
index af2281d29..b139dc544 100644
--- a/source/core/gameinput.cpp
+++ b/source/core/gameinput.cpp
@@ -344,7 +344,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngle& w, Pl
 		if (arc.isReading())
 		{
 			w.ZzOLDANGLE = w.ZzANGLE;
-			w.olook_ang = w.ZzLOOKANG;
+			w.ZzOLDLOOKANG = w.ZzLOOKANG;
 			w.orotscrnang = w.rotscrnang;
 			w.inputdisabled = w.inputdisabled;
 			w.resetadjustment();
diff --git a/source/core/gameinput.h b/source/core/gameinput.h
index 508af2933..901ae2300 100644
--- a/source/core/gameinput.h
+++ b/source/core/gameinput.h
@@ -100,7 +100,7 @@ private:
 
 struct PlayerAngle
 {
-	DAngle ZzANGLE, ZzOLDANGLE, ZzLOOKANG, olook_ang, rotscrnang, orotscrnang, spin;
+	DAngle ZzANGLE, ZzOLDANGLE, ZzLOOKANG, ZzOLDLOOKANG, rotscrnang, orotscrnang, spin;
 
 	friend FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngle& w, PlayerAngle* def);
 
@@ -111,22 +111,22 @@ struct PlayerAngle
 	void backup()
 	{
 		ZzOLDANGLE = ZzANGLE;
-		olook_ang = ZzLOOKANG;
+		ZzOLDLOOKANG = ZzLOOKANG;
 		orotscrnang = rotscrnang;
 	}
 	void restore()
 	{
 		ZzANGLE = ZzOLDANGLE;
-		ZzLOOKANG = olook_ang;
+		ZzLOOKANG = ZzOLDLOOKANG;
 		rotscrnang = orotscrnang;
 	}
 
 	// Commonly used getters.
-	DAngle osum() { return ZzOLDANGLE + olook_ang; }
+	DAngle osum() { return ZzOLDANGLE + ZzOLDLOOKANG; }
 	DAngle sum() { return ZzANGLE + ZzLOOKANG; }
 	DAngle interpolatedsum(double const interpfrac) { return interpolatedvalue(osum(), sum(), interpfrac); }
 	DAngle interpolatedang(double const interpfrac) { return interpolatedvalue(ZzOLDANGLE, ZzANGLE, interpfrac); }
-	DAngle interpolatedlookang(double const interpfrac) { return interpolatedvalue(olook_ang, ZzLOOKANG, interpfrac); }
+	DAngle interpolatedlookang(double const interpfrac) { return interpolatedvalue(ZzOLDLOOKANG, ZzLOOKANG, interpfrac); }
 	DAngle interpolatedrotscrn(double const interpfrac) { return interpolatedvalue(orotscrnang, rotscrnang, interpfrac); }
 	DAngle renderlookang(double const interpfrac) { return !SyncInput() ? ZzLOOKANG : interpolatedlookang(interpfrac); }
 	DAngle renderrotscrn(double const interpfrac) { return !SyncInput() ? rotscrnang : interpolatedrotscrn(interpfrac); }
diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp
index c7deb8483..ec9ac22d6 100644
--- a/source/games/duke/src/premap.cpp
+++ b/source/games/duke/src/premap.cpp
@@ -151,7 +151,7 @@ void resetplayerstats(int snum)
 	p->jetpack_on =         0;
 	p->holoduke_on =       nullptr;
 
-	p->angle.olook_ang = p->angle.ZzLOOKANG = (currentLevel->levelNumber & 1)? DAngle90 : -DAngle90;
+	p->angle.ZzOLDLOOKANG = p->angle.ZzLOOKANG = (currentLevel->levelNumber & 1)? DAngle90 : -DAngle90;
 	p->angle.orotscrnang = p->angle.rotscrnang = nullAngle;
 
 	p->newOwner          =nullptr;