Merge branch 'master' into Mirio/balance

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / touchexplode / touchexplode.qc

diff --git a/qcsrc/common/mutators/mutator/touchexplode/touchexplode.qc b/qcsrc/common/mutators/mutator/touchexplode/touchexplode.qc
index 1698b3a64bd7c1d658cd3d6e05a9bb1a8a376fc2..67e14403c5cfea8d47eda8c705cbf975d6c83e56 100644 (file)
--- a/qcsrc/common/mutators/mutator/touchexplode/touchexplode.qc
+++ b/qcsrc/common/mutators/mutator/touchexplode/touchexplode.qc
@@ -18,7 +18,7 @@ void PlayerTouchExplode(entity p1, entity p2)
 
        entity e = spawn();
        setorigin(e, org);
-       RadiusDamage(e, world, autocvar_g_touchexplode_damage, autocvar_g_touchexplode_edgedamage, autocvar_g_touchexplode_radius, world, world, autocvar_g_touchexplode_force, DEATH_TOUCHEXPLODE.m_id, world);
+       RadiusDamage(e, NULL, autocvar_g_touchexplode_damage, autocvar_g_touchexplode_edgedamage, autocvar_g_touchexplode_radius, NULL, NULL, autocvar_g_touchexplode_force, DEATH_TOUCHEXPLODE.m_id, NULL);
        remove(e);
 }
 
@@ -43,7 +43,5 @@ MUTATOR_HOOKFUNCTION(touchexplode, PlayerPreThink)
                                player.touchexplode_time = it.touchexplode_time = time + 0.2;
                        }
                ));
-
-       return false;
 }
 #endif