From e51a72d1b08f43872b1d8c01f1d8847cc20c479b Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 26 Mar 2011 20:48:29 +0100 Subject: [PATCH] Fix minstagib where isn't possible to shoot when you have 9 cells left --- qcsrc/server/w_minstanex.qc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index 8efda9b07..8977b67fd 100644 --- 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) { @@ -239,8 +240,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 +260,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"); } -- 2.39.2