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 e84356154e483fc0c599debb74e2c1a4df451a46..38f0dc33a0d17391d380946d62ed9c2a99dc2889 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -490,6 +490,8 @@ set g_rc_respawn_delay 0
 set g_cts_respawn_waves 0\r
 set g_cts_respawn_delay 0\r
 set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts"\r
+set g_rpg_respawn_waves 0\r
+set g_rpg_respawn_delay 0\r
 \r
 // overtime\r
 seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit"\r

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index f8114c5b9f532fd789052466daefe194f5e49dae..e047e3bb9f61c6ea82af201e3c9c828ef5c586e5 100644 (file)
--- 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);\r
        timelimit = getstatf(STAT_TIMELIMIT);\r
 \r
+       if(gametype == GAME_RPG && !timelimit) // don't draw the timer in rpg if there's no time limit\r
+               return;\r
+\r
        Sbar_DrawRaceStatus((topright_x - 100) * '1 0 0' + '0 30 0' * scale);\r
        \r
        timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time);\r