From 48377912c45d423247c49443f507d29f0229fe32 Mon Sep 17 00:00:00 2001 From: TimePath Date: Wed, 7 Oct 2015 10:03:28 +1100 Subject: [PATCH] Nades: always override dropweapon --- qcsrc/server/autocvars.qh | 1 + qcsrc/server/mutators/mutator_nades.qc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 454feedfb..affd9437e 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -723,6 +723,7 @@ float autocvar_g_random_gravity_positive; float autocvar_g_random_gravity_negative; float autocvar_g_random_gravity_delay; bool autocvar_g_nades; +bool autocvar_g_nades_override_dropweapon = true; vector autocvar_g_nades_throw_offset; bool autocvar_g_nades_spawn; int autocvar_g_nades_spawn_count; diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc index d4cebf9d7..4fdbbd353 100644 --- a/qcsrc/server/mutators/mutator_nades.qc +++ b/qcsrc/server/mutators/mutator_nades.qc @@ -952,7 +952,7 @@ NadeOffhand OFFHAND_NADE; STATIC_INIT(OFFHAND_NADE) { OFFHAND_NADE = NEW(NadeOff MUTATOR_HOOKFUNCTION(nades_CheckThrow) { - if (self.offhand != OFFHAND_NADE || (self.weapons & WEPSET(HOOK))) { + if (self.offhand != OFFHAND_NADE || (self.weapons & WEPSET(HOOK)) || autocvar_g_nades_override_dropweapon) { nades_CheckThrow(); return true; } -- 2.39.2