コミット: f182d79d6e8306ffdca3b8c72643e85483213e35 - zandronum-tspg (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG).

コミットメタ情報

• リビジョン: f182d79d6e8306ffdca3b8c72643e85483213e35 (tree)
• 日時: 2022-01-17 02:44:36
• 作者: Adam Kaminski <kaminskiadam9@gmai...>
• コミッター: Adam Kaminski

ログメッセージ

Fixed: spectating a morphed player could potentially crash the game.

変更サマリ

• modified: src/p_interaction.cpp

差分

diff -r eb132fa4e960 -r f182d79d6e83 src/p_interaction.cpp
--- a/src/p_interaction.cpp	Sat Mar 12 12:43:36 2022 +1100
+++ b/src/p_interaction.cpp	Sun Jan 16 12:44:36 2022 -0500
@@ -2571,13 +2571,13 @@
 
 		return;
 	}
-	// [AK] If this player's current mobj doesn't match their player class due to
-	// A_SkullPop, then we must reset their mobj back to the original body.
+	// [AK] If this player's current mobj derives from APlayerChunk due to A_SkullPop
+	// then we must reset their mobj back to the original body.
 	else if (( bDeadSpectator == false ) && ( pPlayer->mo != NULL ) && ( pPlayer->cls != NULL ))
 	{
 		APlayerPawn *mo = pPlayer->mo;
 
-		if (( mo->GetClass()->TypeName != pPlayer->cls->TypeName ) && ( mo->target != NULL ))
+		if (( mo->IsKindOf( RUNTIME_CLASS( APlayerChunk ))) && ( mo->target != NULL ))
 		{
 			APlayerPawn *pmo = barrier_cast<APlayerPawn *>( pPlayer->mo->target );
 			mo->player = NULL;