Merge branch 'sev/menu_icons_mipmap' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_rocketflying.qc

diff --git a/qcsrc/server/mutators/mutator_rocketflying.qc b/qcsrc/server/mutators/mutator_rocketflying.qc
index 53bc829bc0920572f7bdce8a8fd519b8c3b3ce7b..5f684b353191f84bc45a150fb34b3609974b24e1 100644 (file)
--- a/qcsrc/server/mutators/mutator_rocketflying.qc
+++ b/qcsrc/server/mutators/mutator_rocketflying.qc
@@ -1,10 +1,15 @@
+#include "../_all.qh"
+
+#include "mutator.qh"
+
 MUTATOR_HOOKFUNCTION(rocketflying_EditProjectile)
 {
-       if(other.classname == "rocket")
+       if(other.classname == "rocket" || other.classname == "mine")
        {
                // kill detonate delay of rockets
                other.spawnshieldtime = time;
        }
+       return 0;
 }
 
 MUTATOR_HOOKFUNCTION(rocketflying_BuildMutatorsString)
@@ -21,8 +26,6 @@ MUTATOR_HOOKFUNCTION(rocketflying_BuildMutatorsPrettyString)
 
 MUTATOR_DEFINITION(mutator_rocketflying)
 {
-       entity e;
-
        MUTATOR_HOOK(EditProjectile, rocketflying_EditProjectile, CBC_ORDER_ANY);
        MUTATOR_HOOK(BuildMutatorsString, rocketflying_BuildMutatorsString, CBC_ORDER_ANY);
        MUTATOR_HOOK(BuildMutatorsPrettyString, rocketflying_BuildMutatorsPrettyString, CBC_ORDER_ANY);