From: Gary Moon <gary@garymoon.net>
Date: Sun, 8 Aug 2021 19:48:30 +0000 (-0400)
Subject: Add option of additional start delay for LMS
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fgazby%2Flms-autojoin-delay;p=xonotic%2Fxonotic-data.pk3dir.git

Add option of additional start delay for LMS
---

diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg
index cf5016389..39e42a8c5 100644
--- a/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@ -449,7 +449,8 @@ 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"
+set g_lms_forcejoin 1 "if true, new players are forced to join in the game"
+set g_lms_extra_start_delay 0 "extra start delay for lms, useful when g_lms_forcejoin is 0"
 
 
 // =========
diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index 6c397d053..3f0487dff 100644
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -466,6 +466,7 @@ void cvar_changes_init()
 		BADCVAR("g_rocket_flying_disabledelays");
 		BADPREFIX("g_spawnshield");
 		BADCVAR("g_start_delay");
+		BADCVAR("g_lms_extra_start_delay");
 		BADCVAR("g_superspectate");
 		BADCVAR("g_tdm_teams_override");
 		BADCVAR("g_warmup");
@@ -2118,6 +2119,9 @@ void readlevelcvars()
 	if (!warmup_stage)
 		game_starttime = time + cvar("g_start_delay");
 
+	if (GetGametype() == "lms")
+		game_starttime += cvar("g_lms_extra_start_delay");
+
 	FOREACH(Weapons, it != WEP_Null, { it.wr_init(it); });
 
 	readplayerstartcvars();