From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 3 Sep 2010 16:15:06 +0000 (+0300)
Subject: Don't show the timer in RPG if there's no time limit. Also add two missing cvars
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=80b1fe478fef0a5cbe7784d8073f828be3457b86;p=voretournament%2Fvoretournament.git

Don't show the timer in RPG if there's no time limit. Also add two missing cvars
---

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index e8435615..38f0dc33 100644
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -490,6 +490,8 @@ set g_rc_respawn_delay 0
 set g_cts_respawn_waves 0
 set g_cts_respawn_delay 0
 set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts"
+set g_rpg_respawn_waves 0
+set g_rpg_respawn_delay 0
 
 // overtime
 seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit"
diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index f8114c5b..e047e3bb 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -1891,6 +1891,9 @@ void Sbar_Timer()
 	scale = cvar_or("sbar_timer_scale", 1);
 	timelimit = getstatf(STAT_TIMELIMIT);
 
+	if(gametype == GAME_RPG && !timelimit) // don't draw the timer in rpg if there's no time limit
+		return;
+
 	Sbar_DrawRaceStatus((topright_x - 100) * '1 0 0' + '0 30 0' * scale);
 	
 	timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time);