- Simplify PlayerAngle::settarget() by adding a dedicated angle set…

…ter that resets interpolated value as well.
ZDoom · May 30, 2022 · 5a55061 · 5a55061
1 parent 0416834
commit 5a55061
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/source/core/gameinput.h b/source/core/gameinput.h
@@ -166,6 +166,9 @@ struct PlayerAngle
 	binangle interpolatedlookang(double const smoothratio) { return interpolatedangle(olook_ang, look_ang, smoothratio); }
 	binangle interpolatedrotscrn(double const smoothratio) { return interpolatedangle(orotscrnang, rotscrnang, smoothratio); }
 
+	// Setter to force angle and its interpolation companion.
+	void setvalue(binangle const value) { oang = ang = value; }
+
 	// Ticrate playsim adjustment helpers.
 	void resetadjustment() { adjustment = 0; }
 	bool targetset() { return target.asbam(); }
@@ -207,17 +210,16 @@ struct PlayerAngle
 		}
 	}
 
-	void settarget(binangle const value, bool const backup = false)
+	void settarget(binangle const value)
 	{
-		if (!SyncInput() && !backup)
+		if (!SyncInput())
 		{
 			target = value;
 			if (!targetset()) target = bamang(1);
 		}
 		else
 		{
 			ang = value;
-			if (backup) oang = ang;
 		}
 	}
 

diff --git a/source/games/blood/src/triggers.cpp b/source/games/blood/src/triggers.cpp
@@ -1543,7 +1543,7 @@ void OperateTeleport(sectortype* pSector)
 				{
 					playerResetInertia(pPlayer);
 					pPlayer->zViewVel = pPlayer->zWeaponVel = 0;
-					pPlayer->angle.settarget(buildang(actor->spr.ang), true);
+					pPlayer->angle.setvalue(buildang(actor->spr.ang));
 				}
 			}
 		}

diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp
@@ -935,7 +935,7 @@ void AIPlayer::Tick(RunListEvent* ev)
         if (nTotalPlayers <= 1)
         {
             auto ang = GetAngleToSprite(pPlayerActor, pSpiritSprite) & kAngleMask;
-            PlayerList[nPlayer].angle.settarget(buildang(ang), true);
+            PlayerList[nPlayer].angle.setvalue(buildang(ang));
             pPlayerActor->spr.ang = ang;
 
             PlayerList[nPlayer].horizon.setvalue(buildhoriz(0));