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

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

Commit MetaInfo

• 修订版: f8baa955611038c5365c73aa10d67af8d7572289 (tree)
• 时间: 2022-01-22 02:51:09
• 作者: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Moved code that disassociates a dead spectator's old body from itself into PLAYER_SetSpectator.

更改概述

• modified: src/p_interaction.cpp
• modified: src/p_mobj.cpp

差异

diff -r 2ea5ba700303 -r f8baa9556110 src/p_interaction.cpp
--- a/src/p_interaction.cpp	Fri Jan 21 00:34:36 2022 -0500
+++ b/src/p_interaction.cpp	Fri Jan 21 12:51:09 2022 -0500
@@ -2661,23 +2661,31 @@
 			// at our corpse in case DF2_SAME_SPAWN_SPOT is enabled.
 			pPlayer->pCorpse = pOldBody;
 
-			// Set the player's new body to the position of his or her old body.
-			if (( pPlayer->mo ) &&
-				( pOldBody ))
+			if ( pOldBody )
 			{
-				// [BB] It's possible that the old body is at a place that's inaccessible to spectators
-				// (whatever source killed the player possibly moved the body after the player's death).
-				// If that's the case, don't move the spectator to the old body position, but to the place
-				// where G_DoReborn spawned him.
-				fixed_t playerSpawnX = pPlayer->mo->x;
-				fixed_t playerSpawnY = pPlayer->mo->y;
-				fixed_t playerSpawnZ = pPlayer->mo->z;
-				pPlayer->mo->SetOrigin( pOldBody->x, pOldBody->y, pOldBody->z );
-				if ( P_TestMobjLocation ( pPlayer->mo ) == false )
-					pPlayer->mo->SetOrigin( playerSpawnX, playerSpawnY, playerSpawnZ );
-
-				if ( NETWORK_GetState( ) == NETSTATE_SERVER )
-					SERVERCOMMANDS_MoveLocalPlayer( ULONG( pPlayer - players ));
+				// Set the player's new body to the position of his or her old body.
+				if ( pPlayer->mo )
+				{
+					// [BB] It's possible that the old body is at a place that's inaccessible to spectators
+					// (whatever source killed the player possibly moved the body after the player's death).
+					// If that's the case, don't move the spectator to the old body position, but to the place
+					// where G_DoReborn spawned him.
+					fixed_t playerSpawnX = pPlayer->mo->x;
+					fixed_t playerSpawnY = pPlayer->mo->y;
+					fixed_t playerSpawnZ = pPlayer->mo->z;
+					pPlayer->mo->SetOrigin( pOldBody->x, pOldBody->y, pOldBody->z );
+					if ( P_TestMobjLocation ( pPlayer->mo ) == false )
+						pPlayer->mo->SetOrigin( playerSpawnX, playerSpawnY, playerSpawnZ );
+
+					if ( NETWORK_GetState( ) == NETSTATE_SERVER )
+						SERVERCOMMANDS_MoveLocalPlayer( ULONG( pPlayer - players ));
+				}
+
+				// [AK] Disassociate the player from their old body. This prevents the old body from
+				// being frozen and not finishing their animation when they become a spectator.
+				// Add their old body to body queue too.
+				G_QueueBody( pOldBody );
+				pOldBody->player = NULL;
 			}
 		}
 		// [BB] In case the player is not respawned as dead spectator, we have to manually clear its TID.

diff -r 2ea5ba700303 -r f8baa9556110 src/p_mobj.cpp
--- a/src/p_mobj.cpp	Fri Jan 21 00:34:36 2022 -0500
+++ b/src/p_mobj.cpp	Fri Jan 21 12:51:09 2022 -0500
@@ -5871,16 +5871,6 @@
 	// [Spleen] Reset reconciliation buffer when player gets spawned
 	UNLAGGED_ResetPlayer( p );
 
-	// [AK] If the player is supposed to be a dead spectator, disassociate them
-	// from the old body. This prevents the old body from being frozen and not
-	// finishing their animation when they become a spectator.
-	// Add their old body to body queue too.
-	if (( p->bDeadSpectator ) && ( oldactor != NULL ) && ( oldactor->player == p ))
-	{
-		G_QueueBody( oldactor );
-		oldactor->player = NULL;
-	}
-
 	// [AK] We've spawned now, so we don't need to remember our corpse anymore.
 	p->pCorpse = NULL;