- Rename PlayerHorizon private members in preparation for replaceme…

…nt work.
ZDoom · Nov 26, 2022 · 8b65395 · 8b65395
1 parent ce3ae65
commit 8b65395
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/source/core/gameinput.cpp b/source/core/gameinput.cpp
@@ -357,14 +357,14 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerHorizon& w,
 	{
 		arc("horiz", w.ZzHORIZON)
 			("horizoff", w.ZzHORIZOFF)
-			("inputdisabled", w.inputdisabled)
+			("inputdisabled", w.legacyDisabledPitch)
 			.EndObject();
 
 		if (arc.isReading())
 		{
 			w.ZzOLDHORIZON = w.ZzHORIZON;
 			w.ZzOHORIZOFF = w.ZzHORIZOFF;
-			w.inputdisabled = w.inputdisabled;
+			w.legacyDisabledPitch = w.legacyDisabledPitch;
 			w.resetAdjustmentPitch();
 		}
 	}

diff --git a/source/core/gameinput.h b/source/core/gameinput.h
@@ -34,19 +34,19 @@ struct PlayerHorizon
 	DAngle horizLERPSUM(double const interpfrac) { return interpolatedvalue(horizOLDSUM(), horizSUM(), interpfrac); }
 
 	// Ticrate playsim adjustment helpers.
-	void resetAdjustmentPitch() { adjustment = nullAngle; }
+	void resetAdjustmentPitch() { legacyAdjustmentPitch = nullAngle; }
 
 	// Input locking helpers.
-	void lockPitch() { inputdisabled = true; }
-	void unlockPitch() { inputdisabled = false; }
-	bool lockedPitch() { return target.Sgn() || inputdisabled; }
+	void lockPitch() { legacyDisabledPitch = true; }
+	void unlockPitch() { legacyDisabledPitch = false; }
+	bool lockedPitch() { return legacyTargetPitch.Sgn() || legacyDisabledPitch; }
 
 	// Ticrate playsim adjustment setters and processor.
 	void addToPitch(DAngle const value)
 	{
 		if (!SyncInput())
 		{
-			adjustment += value;
+			legacyAdjustmentPitch += value;
 		}
 		else
 		{
@@ -61,7 +61,7 @@ struct PlayerHorizon
 
 		if (!SyncInput() && !backup)
 		{
-			target = value.Sgn() ? value : minAngle;
+			legacyTargetPitch = value.Sgn() ? value : minAngle;
 		}
 		else
 		{
@@ -74,27 +74,27 @@ struct PlayerHorizon
 	{
 		if (targetedPitch())
 		{
-			auto delta = deltaangle(ZzHORIZON, target);
+			auto delta = deltaangle(ZzHORIZON, legacyTargetPitch);
 
 			if (abs(delta).Degrees() > 0.45)
 			{
 				ZzHORIZON += delta * scaleAdjust;
 			}
 			else
 			{
-				ZzHORIZON = target;
-				target = nullAngle;
+				ZzHORIZON = legacyTargetPitch;
+				legacyTargetPitch = nullAngle;
 			}
 		}
-		else if (adjustment.Sgn())
+		else if (legacyAdjustmentPitch.Sgn())
 		{
-			ZzHORIZON += adjustment * scaleAdjust;
+			ZzHORIZON += legacyAdjustmentPitch * scaleAdjust;
 		}
 	}
 
 private:
-	DAngle target, adjustment;
-	bool inputdisabled;
+	DAngle legacyTargetPitch, legacyAdjustmentPitch;
+	bool legacyDisabledPitch;
 };
 
 struct PlayerAngle