From 8d652b54cbb1450b40ea4d815933bc7bd8e16079 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 9 Jun 2013 14:54:16 +1000 Subject: [PATCH] Add some more checks to make sure nades don't use hook key when the hook weapon is available --- qcsrc/server/mutators/mutator_nades.qc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc index f3a1d65d6..36a5cab21 100644 --- a/qcsrc/server/mutators/mutator_nades.qc +++ b/qcsrc/server/mutators/mutator_nades.qc @@ -289,7 +289,7 @@ MUTATOR_HOOKFUNCTION(nades_VehicleEnter) MUTATOR_HOOKFUNCTION(nades_PlayerPreThink) { - float key_pressed = ((g_grappling_hook) ? self.button16 : self.BUTTON_HOOK); + float key_pressed = ((g_grappling_hook || client_hasweapon(self, WEP_HOOK, FALSE, FALSE) || WEPSET_CONTAINS_AW(weaponsInMap, WEP_HOOK)) ? self.button16 : self.BUTTON_HOOK); if(self.nade) if(self.nade.wait - 0.1 <= time) -- 2.39.2