Commit: 80f6abcba67796e2c0436e64269ae4085c7b957e - zatspg-beta (hg)

This is a fork of Zandronum Beta for TSPG.

Commit MetaInfo

• Révision: 80f6abcba67796e2c0436e64269ae4085c7b957e (tree)
• l'heure: 2021-09-30 04:57:51
• Auteur: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Message de Log

Make sure any changed flags belonging to "lmsallowedweapons" get printed as well.

Change Summary

• modified: src/lastmanstanding.cpp
• modified: src/sv_main.cpp

Modification

diff -r bad1f7a252cd -r 80f6abcba677 src/lastmanstanding.cpp
--- a/src/lastmanstanding.cpp	Wed Sep 29 15:57:10 2021 -0400
+++ b/src/lastmanstanding.cpp	Wed Sep 29 15:57:51 2021 -0400
@@ -784,12 +784,7 @@
 // [AK] Added CVAR_GAMEMODELOCK.
 CUSTOM_CVAR( Int, lmsallowedweapons, LMS_AWF_ALLALLOWED, CVAR_SERVERINFO | CVAR_GAMEMODELOCK )
 {
-	if (( NETWORK_GetState( ) == NETSTATE_SERVER ) && ( gamestate != GS_STARTUP ))
-	{
-		SERVER_Printf( "%s changed to: %d\n", self.GetName( ), (int)self );
-		if ( lastmanstanding || teamlms )
-			SERVERCOMMANDS_SetLMSAllowedWeapons( );
-	}
+	SERVER_FlagsetChanged( self );
 }
 CVAR( Flag, lms_allowpistol, lmsallowedweapons, LMS_AWF_PISTOL );
 CVAR( Flag, lms_allowshotgun, lmsallowedweapons, LMS_AWF_SHOTGUN );

diff -r bad1f7a252cd -r 80f6abcba677 src/sv_main.cpp
--- a/src/sv_main.cpp	Wed Sep 29 15:57:10 2021 -0400
+++ b/src/sv_main.cpp	Wed Sep 29 15:57:51 2021 -0400
@@ -4500,9 +4500,18 @@
 
 	// [AK] We also need to tell the clients to update the changed flagset.
 	if ( flagset == *lmsspectatorsettings )
+	{
 		SERVERCOMMANDS_SetLMSSpectatorSettings( );
+	}
+	else if ( flagset == *lmsallowedweapons )
+	{
+		if (( lastmanstanding ) || ( teamlms ))
+			SERVERCOMMANDS_SetLMSAllowedWeapons( );
+	}
 	else
+	{
 		SERVERCOMMANDS_SetGameDMFlags( );
+	}
 }
 
 //*****************************************************************************