Merge branch 'Mario/rifle_arena' into Mario/mutators

[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 4cd26a41daf42ef779933a5a8ba34f4349e82e6a..03a5bde619683445ac5929017ca51ade53936b71 100644 (file)
--- a/qcsrc/server/mutators/mutator_rocketflying.qc
+++ b/qcsrc/server/mutators/mutator_rocketflying.qc
@@ -1,6 +1,6 @@
 MUTATOR_HOOKFUNCTION(rocketflying_EditProjectile)
 {
-       if(other.classname == "rocket")
+       if(other.classname == "rocket" || other.classname == "mine")
        {
                // kill detonate delay of rockets
                other.spawnshieldtime = time;
@@ -22,8 +22,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);