]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix a crash with sandbox
authorMario <mario@smbclan.net>
Sat, 11 Jun 2016 06:16:07 +0000 (16:16 +1000)
committerMario <mario@smbclan.net>
Sat, 11 Jun 2016 06:16:07 +0000 (16:16 +1000)
qcsrc/common/mutators/mutator/hook/hook.qc
qcsrc/common/mutators/mutator/nix/nix.qc
qcsrc/common/mutators/mutator/sandbox/sandbox.qc

index 21375d315c67af43857bff1ae91896d7331427b0..e72134e0e708160e37aea70e3ae056de087272a6 100644 (file)
@@ -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)
index 6288d1a4eb3dd3f73fd26e077b058ce70ba3ae00..6f08a8e596cc73d85fa4d29855e3e7fd62709c99 100644 (file)
@@ -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)
index 56d0fb34e4d10da7b2e283f416290ef08d5f84e7..22127ad31f8680b6a51120dcca30129452eb214d 100644 (file)
@@ -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;