Merge remote branch 'origin/fruitiex/panelhud'

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index adaf36f16415dc860c2b746dfc5d42074e98a856..9203d87a1ae760f97561fff1dbd9a1fe5b19d60f 100644 (file)
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -261,7 +261,7 @@ void SV_ParseClientCommand(string s) {
                if not(self.flags & FL_CLIENT)
                        return;
 
-               if((inWarmupStage && 0 >= g_warmup_limit) // with unlimited warmup players have to be able to restart
+               if((inWarmupStage)
                   || autocvar_sv_ready_restart || g_race_qualifying == 2)
                {
                        if(!readyrestart_happened || autocvar_sv_ready_restart_repeatable)

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index a5192b13c47d1220014801152950f58cdf246a90..4bcccf3cf5411072b382485da9b3edafa0569ef2 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -452,6 +452,8 @@ void cvar_changes_init()
                BADCVAR("sv_vote_master_password");
                BADCVAR("sv_vote_simple_majority_factor");
                BADCVAR("timelimit_override");
+               BADCVAR("g_warmup");
+               BADPREFIX("g_warmup_");
 
                if(autocvar_g_minstagib)
                {