Fix force join in LMS

diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg
index 77a6d735dc80c97fff785a4ffdbf9ecabc7d1fca..cf50163892b016ebb936a6af232893255ab54510 100644 (file)
--- a/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@ -449,6 +449,7 @@ set g_lms_regenerate 0
 set g_lms_last_join 3  "if g_lms_join_anytime is false, new players can only join if the worst active player has more than (fraglimit - g_lms_last_join) lives"
 set g_lms_join_anytime 1       "if true, new players can join, but get same amount of lives as the worst player"
 set g_lms_weaponarena "most_available" "starting weapons - takes the same options as g_weaponarena"
+set g_lms_forcejoin 0 "if true, new players are forced to join in the game"
 
 
 // =========

diff --git a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
index dc18b7c9072413a51d0d93d2aff0993682cb0750..27f50484b22870410215b5d8795641e52ce2724c 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
+++ b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
@@ -10,6 +10,7 @@ int autocvar_g_lms_extra_lives;
 bool autocvar_g_lms_join_anytime;
 int autocvar_g_lms_last_join;
 bool autocvar_g_lms_regenerate;
+bool autocvar_g_lms_forcejoin;
 
 // main functions
 int LMS_NewPlayerLives()
@@ -267,11 +268,12 @@ MUTATOR_HOOKFUNCTION(lms, ClientConnect)
        }
 }
 
-// FIXME LMS doesn't allow clients to spectate due to its particular implementation
+// LMS doesn't allow clients to spectate due to its particular implementation
 MUTATOR_HOOKFUNCTION(lms, AutoJoinOnConnection)
 {
-       if(autocvar_g_campaign)
+       if(autocvar_g_campaign || !autocvar_g_lms_forcejoin)
                return false;
+
        return true;
 }