From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 4 Feb 2014 16:19:19 +0000 (+0100)
Subject: Implement vote 215. Fixes #1895.
X-Git-Tag: xonotic-v0.8.0~226^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c65ced7943819d2fa59bc23f70018a98d08abced;p=xonotic%2Fxonotic-data.pk3dir.git

Implement vote 215. Fixes #1895.
---

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 9addcbc7d..bf6ba106d 100644
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -87,11 +87,10 @@ seta g_invasion_round_limit -1 "Invasion round limit overriding the mapinfo spec
 //  respawn delay/waves/weapon_stay
 // =================================
 // when variables are set to anything other than 0, they take over the global setting. Negative values force an output value of zero.
-// to force disable delay or waves, set them to 0.125
-set g_ctf_respawn_delay_small 5
-set g_ctf_respawn_delay_small_count 0
+set g_ctf_respawn_delay_small 1
+set g_ctf_respawn_delay_small_count 1
 set g_ctf_respawn_delay_large 5
-set g_ctf_respawn_delay_large_count 0
+set g_ctf_respawn_delay_large_count 5
 set g_ctf_respawn_delay_max 0
 set g_ctf_respawn_waves 0
 set g_ctf_weapon_stay 0