From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 12 Jul 2011 21:18:07 +0000 (+0300)
Subject: No warmup stage or start delay in RPG
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=fab09967239e69b30d9f5e118a5ddc5ed1f01ddd;hp=603e043971aa9e17c39a2c7673989f578e0235a8

No warmup stage or start delay in RPG
---

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