提交: ed8af76527549dda5f59075e527085bdda3d15ca - zandronum-macos-beta (hg)

This is a fork of Zandronum Beta for Mac Os (Silicon and Intel)

Commit MetaInfo

• 修訂: ed8af76527549dda5f59075e527085bdda3d15ca (tree)
• 時間: 2022-09-07 21:57:19
• 作者: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Fixed: cl_telespy still teleported a spectator when they were already looking through their own eyes.

Change Summary

• modified: docs/zandronum-history.txt
• modified: src/g_game.cpp

差異

diff -r 82c883d82cce -r ed8af7652754 docs/zandronum-history.txt
--- a/docs/zandronum-history.txt	Wed Sep 07 08:56:59 2022 -0400
+++ b/docs/zandronum-history.txt	Wed Sep 07 08:57:19 2022 -0400
@@ -74,6 +74,7 @@
 -	- Fixed: players could still respawn (albeit frozen) during the result sequence if sv_forcerespawn was on. [Kaminsky]
 -	- Fixed: puffs didn't enter their XDeath states in online games. [Kaminsky]
 -	- Fixed: spawning game mode artifacts like the possession stone and terminator ball didn't correctly account for useplayerstartz. [Kaminsky]
+-	- Fixed: cl_telespy still teleported a spectator when they were already looking through their own eyes. [Kaminsky]
 !	- The result value of GAMEEVENT_MEDALS event scripts can now be used to determine whether or not the player receives the medal. [Kaminsky]
 !	- GAMEMODE flags are now validated after all GAMEMODE lumps have been parsed instead of after each one. The internal game mode name (e.g. "TeamLMS") is now printed with the error message instead of the actual name. [Kaminsky]
 !	- Added an extra check to ensure that game modes have a (short) name. [Kaminsky]

diff -r 82c883d82cce -r ed8af7652754 src/g_game.cpp
--- a/src/g_game.cpp	Wed Sep 07 08:56:59 2022 -0400
+++ b/src/g_game.cpp	Wed Sep 07 08:57:19 2022 -0400
@@ -1147,13 +1147,16 @@
 {
 	// [AK] If we're a spectator and want to teleport ourselves to the player we just
 	// spied on, do it when we switch back to our own view.
-	if (( cl_telespy ) && ( ulPlayer == consoleplayer ) && ( players[consoleplayer].bSpectating ) && ( players[consoleplayer].camera ))
-	{
-		P_TeleportMove( players[consoleplayer].mo, players[consoleplayer].camera->x,
-			players[consoleplayer].camera->y, players[consoleplayer].camera->z, false );
-
-		players[consoleplayer].mo->angle = players[consoleplayer].camera->angle;
-		players[consoleplayer].mo->pitch = players[consoleplayer].camera->pitch;
+	if (( cl_telespy ) && ( ulPlayer == consoleplayer ) && ( players[consoleplayer].bSpectating ))
+	{
+		if (( players[consoleplayer].camera ) && ( players[consoleplayer].camera != players[consoleplayer].mo ))
+		{
+			P_TeleportMove( players[consoleplayer].mo, players[consoleplayer].camera->x,
+				players[consoleplayer].camera->y, players[consoleplayer].camera->z, false );
+
+			players[consoleplayer].mo->angle = players[consoleplayer].camera->angle;
+			players[consoleplayer].mo->pitch = players[consoleplayer].camera->pitch;
+		}
 	}
 
 	players[consoleplayer].camera = players[ulPlayer].mo;