提交: 80d9bfcca402a8b70e37c67691d656f4fa6b4be7 - zandronum-macos-beta (hg)

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

Commit MetaInfo

• 修訂: 80d9bfcca402a8b70e37c67691d656f4fa6b4be7 (tree)
• 時間: 2022-08-24 11:20:29
• 作者: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Fixed: players could still respawn (albeit frozen) during the result sequence if sv_forcerespawn was on.

Change Summary

• modified: src/p_user.cpp

差異

diff -r 2a28adcd804b -r 80d9bfcca402 src/p_user.cpp
--- a/src/p_user.cpp	Tue Aug 23 15:37:47 2022 -0400
+++ b/src/p_user.cpp	Tue Aug 23 22:20:29 2022 -0400
@@ -3261,7 +3261,8 @@
 			return;
 	}
 
-	if ( level.time >= player->respawn_time )
+	// [AK] Don't allow players to respawn during the result sequence, in case sv_forcerespawn is on.
+	if ( level.time >= player->respawn_time && GAMEMODE_IsGameInResultSequence( ) == false )
 	{
 		if (((( player->cmd.ucmd.buttons & BT_USE ) || ( ( player->userinfo.GetClientFlags() & CLIENTFLAGS_RESPAWNONFIRE ) && ( player->cmd.ucmd.buttons & BT_ATTACK ) && (( player->oldbuttons & BT_ATTACK ) == false ))) || 
 			(( deathmatch || teamgame || alwaysapplydmflags ) &&