Nades: always override dropweapon

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 454feedfbd7dc69ae2d1d60b488550f48a93c50a..affd9437ed279b83675d7fdd3d9ab9b12d3cda6a 100644 (file)
--- 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 d4cebf9d7a172597fd8be264d1834effa6316ae9..4fdbbd353dbf4ef70e4d9dbed1cfd3f608585215 100644 (file)
--- 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;
        }