Commit: 62e12bc075dddaa7b92681b4a40008ab10fcf1fa - zatspg-beta (hg)

This is a fork of Zandronum Beta for TSPG.

Commit MetaInfo

• Revision: 62e12bc075dddaa7b92681b4a40008ab10fcf1fa (tree)
• Time: 2021-12-01 02:08:12
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Fixed survival being stuck in the "mission failed" state indefinitely if it was interrupted by the intermission screen.

Change Summary

• modified: src/p_setup.cpp

Incremental Difference

diff -r 982a9da3e0a0 -r 62e12bc075dd src/p_setup.cpp
--- a/src/p_setup.cpp	Sun Nov 28 23:40:25 2021 +0000
+++ b/src/p_setup.cpp	Tue Nov 30 12:08:12 2021 -0500
@@ -4680,6 +4680,16 @@
 		// [BB] We have to reset the state though when this is a new game.
 		if ( ( SURVIVAL_GetState( ) == SURVS_COUNTDOWN ) || ( gameaction == ga_newgame ) )
 			SURVIVAL_SetState( SURVS_WAITINGFORPLAYERS );
+
+		// [AK] If we still advanced to the next map when the mission failed, then either the countdown
+		// if there's still people playing, or reset the state entirely.
+		if ( SURVIVAL_GetState( ) == SURVS_MISSIONFAILED )
+		{
+			if ( SERVER_CalcNumNonSpectatingPlayers( MAXPLAYERS ) < 1 )
+				SURVIVAL_SetState( SURVS_WAITINGFORPLAYERS );
+			else
+				SURVIVAL_StartCountdown(( sv_survivalcountdowntime > 0 ? sv_survivalcountdowntime : 20 ) * TICRATE - 1 );
+		}
 	}
 
 	if ( NETWORK_InClientMode() == false )