always check the nex primary ammo when trying to charge. We don't want to allow switc...
authorFruitieX <fruitiex@gmail.com>
Wed, 17 Nov 2010 18:32:43 +0000 (20:32 +0200)
committerFruitieX <fruitiex@gmail.com>
Wed, 17 Nov 2010 18:32:43 +0000 (20:32 +0200)
qcsrc/server/w_nex.qc

index 2d0cc7a..97cdaae 100644 (file)
@@ -175,9 +175,7 @@ float w_nex(float req)
        {
                if(cvar("g_balance_nex_secondary_charge_pool"))
                        return TRUE;
-               if(cvar("g_balance_nex_secondary_charge") && cvar("g_balance_nex_secondary_ammo")) // if charge consumes ammo, don't allow consuming so much that we cant fire a primary anymore
-                       return self.ammo_cells >= cvar("g_balance_nex_primary_ammo");
-               return self.ammo_cells >= cvar("g_balance_nex_secondary_ammo");
+               return self.ammo_cells >= cvar("g_balance_nex_primary_ammo"); // don't allow charging if we don't have enough ammo
        }
        return TRUE;
 };