From 7c7446cd677470ba82acd90301398f7a4f43103b Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Tue, 19 Jul 2011 15:59:37 +0300 Subject: [PATCH] No alt fire if hooked or firing the hook --- data/qcsrc/server/w_grabber.qc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc index 4de8425b..cbd202b6 100644 --- a/data/qcsrc/server/w_grabber.qc +++ b/data/qcsrc/server/w_grabber.qc @@ -81,7 +81,7 @@ float w_grabber(float req) // determine by distance if this will be primary fire or alternate fire W_SetupShot (self, TRUE, 0, "", 0); // do this to update w_shotorg WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), FALSE, self, ANTILAG_LATENCY(self)); - if(trace_fraction < 1) + if(trace_fraction < 1 && !self.grabber) // not if hooked or firing the hook self.stat_crosshair_style = 1; else self.stat_crosshair_style = 0; @@ -96,7 +96,7 @@ float w_grabber(float req) } else if(self.clip_load >= 0 && !self.stat_eaten) // we're not currently reloading or eaten { - if(trace_fraction >= 1 && self.BUTTON_ATCK && weapon_action(self.weapon, WR_CHECKAMMO1)) // primary attack + if(!self.stat_crosshair_style && self.BUTTON_ATCK && weapon_action(self.weapon, WR_CHECKAMMO1)) // primary attack { if(time < self.weapon_delay) return FALSE; -- 2.39.2