From 9e20aea43256ae8fea0e5be97acdd7bc9a406ad4 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 11 Jun 2016 16:16:07 +1000 Subject: [PATCH] Fix a crash with sandbox --- qcsrc/common/mutators/mutator/hook/hook.qc | 2 ++ qcsrc/common/mutators/mutator/nix/nix.qc | 2 ++ qcsrc/common/mutators/mutator/sandbox/sandbox.qc | 10 ---------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/qcsrc/common/mutators/mutator/hook/hook.qc b/qcsrc/common/mutators/mutator/hook/hook.qc index 21375d315..e72134e0e 100644 --- a/qcsrc/common/mutators/mutator/hook/hook.qc +++ b/qcsrc/common/mutators/mutator/hook/hook.qc @@ -10,6 +10,8 @@ REGISTER_MUTATOR(hook, autocvar_g_grappling_hook) { g_grappling_hook = false; WEP_HOOK.ammo_factor = 1; } + + return false; } MUTATOR_HOOKFUNCTION(hook, BuildMutatorsString) diff --git a/qcsrc/common/mutators/mutator/nix/nix.qc b/qcsrc/common/mutators/mutator/nix/nix.qc index 6288d1a4e..6f08a8e59 100644 --- a/qcsrc/common/mutators/mutator/nix/nix.qc +++ b/qcsrc/common/mutators/mutator/nix/nix.qc @@ -66,6 +66,8 @@ REGISTER_MUTATOR(nix, cvar("g_nix") && !cvar("g_instagib") && !cvar("g_overkill" PS(it).m_switchweapon = w_getbestweapon(it); }); } + + return false; } bool NIX_CanChooseWeapon(int wpn) diff --git a/qcsrc/common/mutators/mutator/sandbox/sandbox.qc b/qcsrc/common/mutators/mutator/sandbox/sandbox.qc index 56d0fb34e..22127ad31 100644 --- a/qcsrc/common/mutators/mutator/sandbox/sandbox.qc +++ b/qcsrc/common/mutators/mutator/sandbox/sandbox.qc @@ -25,16 +25,6 @@ REGISTER_MUTATOR(sandbox, cvar("g_sandbox")) if(autocvar_g_sandbox_storage_autoload) sandbox_Database_Load(); } - - MUTATOR_ONROLLBACK_OR_REMOVE - { - // nothing to roll back - } - - MUTATOR_ONREMOVE - { - // nothing to remove - } } const float MAX_STORAGE_ATTACHMENTS = 16; -- 2.39.2