From 3711f556d8756c9f2c50880e38ad5ca623f2efec Mon Sep 17 00:00:00 2001 From: FruitieX Date: Wed, 17 Nov 2010 20:32:43 +0200 Subject: [PATCH] always check the nex primary ammo when trying to charge. We don't want to allow switching back to the nex if we're out of ammo. --- qcsrc/server/w_nex.qc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc index 2d0cc7a60..97cdaae3e 100644 --- a/qcsrc/server/w_nex.qc +++ b/qcsrc/server/w_nex.qc @@ -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; }; -- 2.39.2