Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index c42d67fa03705b95c589daab74b463e59aadcbd4..1226c252cccd1fab358f082bde6884507acdc143 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1770,10 +1770,10 @@ void HUD_Weapons(void)
                                drawstring(wpnpos, getcommandkey(ftos(weapid), strcat("impulse ", ftos(weapid))), '1 1 0' * 0.5 * wpnsize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 
                        // draw ammo status bar
-                       if(show_ammo && weapid != WEP_TUBA && weapid != WEP_LASER && weapid != WEP_PORTO)
+                       if(show_ammo && self.weapon != WEP_TUBA && self.weapon != WEP_LASER && self.weapon != WEP_PORTO)
                        {
                                a = 0;
-                               type = GetAmmoTypeForWep(weapid);
+                               type = GetAmmoTypeForWep(self.weapon);
                                if(type != -1)
                                        a = getstati(GetAmmoStat(type)); // how much ammo do we have?
 

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..e2a123adc445f1a7eb0291001bf828357d6db770 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -325,6 +325,7 @@ void cvar_changes_init()
                BADCVAR("g_ctf");
                BADCVAR("g_dm");
                BADCVAR("g_domination");
+               BADCVAR("g_freezetag");
                BADCVAR("g_keyhunt");
                BADCVAR("g_keyhunt_teams");
                BADCVAR("g_onslaught");
@@ -452,6 +453,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)
                {