• R/O
  • SSH

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-c誰得cocoaqtpythonrubywindowsphpgameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwitterdombtronvb.nettestarduinodirectxpreviewerゲームエンジン

This is a fork of Zandronum Beta for TSPG.


Commit MetaInfo

Revision80f6abcba67796e2c0436e64269ae4085c7b957e (tree)
Time2021-09-30 04:57:51
AuthorAdam Kaminski <kaminskiadam9@gmai...>
CommiterAdam Kaminski

Log Message

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

Change Summary

Incremental Difference

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 @@
784784 // [AK] Added CVAR_GAMEMODELOCK.
785785 CUSTOM_CVAR( Int, lmsallowedweapons, LMS_AWF_ALLALLOWED, CVAR_SERVERINFO | CVAR_GAMEMODELOCK )
786786 {
787- if (( NETWORK_GetState( ) == NETSTATE_SERVER ) && ( gamestate != GS_STARTUP ))
788- {
789- SERVER_Printf( "%s changed to: %d\n", self.GetName( ), (int)self );
790- if ( lastmanstanding || teamlms )
791- SERVERCOMMANDS_SetLMSAllowedWeapons( );
792- }
787+ SERVER_FlagsetChanged( self );
793788 }
794789 CVAR( Flag, lms_allowpistol, lmsallowedweapons, LMS_AWF_PISTOL );
795790 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 @@
45004500
45014501 // [AK] We also need to tell the clients to update the changed flagset.
45024502 if ( flagset == *lmsspectatorsettings )
4503+ {
45034504 SERVERCOMMANDS_SetLMSSpectatorSettings( );
4505+ }
4506+ else if ( flagset == *lmsallowedweapons )
4507+ {
4508+ if (( lastmanstanding ) || ( teamlms ))
4509+ SERVERCOMMANDS_SetLMSAllowedWeapons( );
4510+ }
45044511 else
4512+ {
45054513 SERVERCOMMANDS_SetGameDMFlags( );
4514+ }
45064515 }
45074516
45084517 //*****************************************************************************