No warmup stage or start delay in RPG

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 3a97b623c4b38e41b6060eb62fbeb7c386c33eca..2f36d6073eb03ecbf85862c12395cb15aba0be5b 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1031,7 +1031,7 @@ void readlevelcvars(void)
        g_warmup_allguns = cvar("g_warmup_allguns");\r
        g_warmup_allow_timeout = cvar("g_warmup_allow_timeout");\r
 \r
-       if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || cvar("g_campaign"))\r
+       if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || g_rpg || cvar("g_campaign"))\r
                inWarmupStage = 0; // these modes cannot work together, sorry\r
 \r
        g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon");\r
@@ -1083,7 +1083,7 @@ void readlevelcvars(void)
        if(g_ghost_items >= 1)\r
                g_ghost_items = 0.25; // default alpha value\r
 \r
-       if not(inWarmupStage && !g_ca)\r
+       if not(inWarmupStage && !g_ca && !g_rpg)\r
                game_starttime = cvar("g_start_delay");\r
 \r
        sv_pitch_min = cvar("sv_pitch_min");\r