Merge remote branch 'origin/master' into samual/mutator_ctf

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index d73508c73990b05b17bcd129d3472ea593eee549..1f998f63b9f912dbfdaebdde1f28c6e5e73e277c 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -494,7 +494,6 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 entity damage_targ;
 entity damage_inflictor;
 entity damage_attacker;
-.float prevhitsound;
 
 void Damage (entity targ, entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 4c41852ebba66057b10d7d906c5b199a55994005..c45ad96e298d3a379dbd5b7c6bf4ec0a2253435b 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1437,7 +1437,6 @@ void DumpStats(float final)
        float to_eventlog;
        float to_file;
        float i;
-       entity e;
 
        to_console = autocvar_sv_logscores_console;
        to_eventlog = autocvar_sv_eventlog;

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 6c7a7dbc3350208546216979e4df167e2a1bf004..8d5fa100c92eec6bdc2f34a793ed917ccd7e5a92 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -375,7 +375,6 @@ void WinningConditionHelper()
        entity winnerscorekeeper;
        entity secondscorekeeper;
        entity sk;
-       float slots;
 
        // format:
        // gametype:P<pure>:S<slots>::plabel,plabel:tlabel,tlabel:teamid:tscore,tscore:teamid:tscore,tscore

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 8efda9b07f279cea118cf0fd330f6455474d4d52..4481178de19b4b3b07a276dae2e6b3f6099058e0 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -94,6 +94,7 @@ void minstagib_ammocheck (void)
                return;
 
        if (self.ammo_cells <= 0)
+       if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
        {
                if (self.health == 5)
                {
@@ -168,10 +169,17 @@ void minstagib_ammocheck (void)
 
 void spawnfunc_weapon_minstanex (void); // defined in t_items.qc
 
-float minstanex_ammo;
 float w_minstanex(float req)
 {
        float ammo_amount;
+       float minstanex_ammo;
+
+       // now multiple WR_s use this
+       if(g_minstagib)
+               minstanex_ammo = 1;
+       else
+               minstanex_ammo = autocvar_g_balance_minstanex_ammo;
+
        if (req == WR_AIM)
        {
                if(self.ammo_cells > 0)
@@ -181,11 +189,6 @@ float w_minstanex(float req)
        }
        else if (req == WR_THINK)
        {
-               if(g_minstagib)
-                       minstanex_ammo = 1;
-               else
-                       minstanex_ammo = autocvar_g_balance_minstanex_ammo;
-
                // if the laser uses load, we also consider its ammo for reloading
                if(autocvar_g_balance_minstanex_reload_ammo && autocvar_g_balance_minstanex_laser_ammo && self.clip_load < min(minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo)) // forced reload
                        weapon_action(self.weapon, WR_RELOAD);
@@ -239,8 +242,8 @@ float w_minstanex(float req)
        }
        else if (req == WR_CHECKAMMO1)
        {
-               ammo_amount = self.ammo_cells >= autocvar_g_balance_minstanex_ammo;
-               ammo_amount += self.weapon_load[WEP_MINSTANEX] >= autocvar_g_balance_minstanex_ammo;
+               ammo_amount = self.ammo_cells >= minstanex_ammo;
+               ammo_amount += self.weapon_load[WEP_MINSTANEX] >= minstanex_ammo;
                return ammo_amount;
        }
        else if (req == WR_CHECKAMMO2)
@@ -259,9 +262,9 @@ float w_minstanex(float req)
        {
                float used_ammo;
                if(autocvar_g_balance_minstanex_laser_ammo)
-                       used_ammo = min(autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo);
+                       used_ammo = min(minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo);
                else
-                       used_ammo = autocvar_g_balance_minstanex_ammo;
+                       used_ammo = minstanex_ammo;
 
                W_Reload(used_ammo, autocvar_g_balance_minstanex_reload_ammo, autocvar_g_balance_minstanex_reload_time, "weapons/reload.wav");
        }