From d64d2b05a6a4aac377d2719d443ae12dc6088f2d Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Tue, 12 Apr 2011 18:57:14 +0300 Subject: [PATCH] Improve how firing buttons are checked --- qcsrc/server/w_hagar.qc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index b33e950aa..1d2e42bb9 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -161,6 +161,7 @@ void W_Hagar_Attack2_Load (void) } else if(self.hagar_loadreset) { + // both firing buttons were released, which means we can load again self.hagar_loadreset = FALSE; } @@ -250,15 +251,16 @@ float w_hagar(float req) if(autocvar_g_balance_hagar_reload_ammo && self.clip_load < min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo)) // forced reload weapon_action(self.weapon, WR_RELOAD); - else if (self.BUTTON_ATCK && (!self.BUTTON_ATCK2 && loadable_secondary) && !self.hagar_load) // not while loading the secondary fire + else if (self.BUTTON_ATCK && !(self.BUTTON_ATCK2 && loadable_secondary)) { + if (!self.hagar_load) // not while the secondary fire is loaded if (weapon_prepareattack(0, autocvar_g_balance_hagar_primary_refire)) { W_Hagar_Attack(); weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hagar_primary_refire, w_ready); } } - else if(loadable_secondary) + else if (loadable_secondary) W_Hagar_Attack2_Load(); // must run each frame else if (self.BUTTON_ATCK2 && autocvar_g_balance_hagar_secondary) { -- 2.39.2