From: Mario <mario@smbclan.net>
Date: Sat, 11 Jun 2016 06:16:07 +0000 (+1000)
Subject: Fix a crash with sandbox
X-Git-Tag: xonotic-v0.8.2~829
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9e20aea43256ae8fea0e5be97acdd7bc9a406ad4;p=xonotic%2Fxonotic-data.pk3dir.git

Fix a crash with sandbox
---

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;