X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_touchexplode.qc;h=fb58b3955cbbbcae1913b3628bce8e354a521dff;hb=754e6b0083895315729a0d0ba42a2e798f61d365;hp=30b01b0daa0933351e754df39d45503c17ca2a66;hpb=d51c9ed7a2355f4456f50867741807ab9c9d28d3;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/mutator_touchexplode.qc b/qcsrc/server/mutators/mutator_touchexplode.qc index 30b01b0da..fb58b3955 100644 --- a/qcsrc/server/mutators/mutator_touchexplode.qc +++ b/qcsrc/server/mutators/mutator_touchexplode.qc @@ -4,7 +4,7 @@ void PlayerTouchExplode(entity p1, entity p2) { vector org; org = (p1.origin + p2.origin) * 0.5; - org_z += (p1.mins_z + p2.mins_z) * 0.5; + org.z += (p1.mins.z + p2.mins.z) * 0.5; sound(self, CH_TRIGGER, "weapons/grenade_impact.wav", VOL_BASE, ATTEN_NORM); pointparticles(particleeffectnum("explosion_small"), org, '0 0 0', 1); @@ -12,7 +12,7 @@ void PlayerTouchExplode(entity p1, entity p2) entity e; e = spawn(); setorigin(e, org); - RadiusDamage(e, world, autocvar_g_touchexplode_damage, autocvar_g_touchexplode_edgedamage, autocvar_g_touchexplode_radius, world, autocvar_g_touchexplode_force, DEATH_TOUCHEXPLODE, world); + RadiusDamage(e, world, autocvar_g_touchexplode_damage, autocvar_g_touchexplode_edgedamage, autocvar_g_touchexplode_radius, world, world, autocvar_g_touchexplode_force, DEATH_TOUCHEXPLODE, world); remove(e); } @@ -37,12 +37,12 @@ MUTATOR_HOOKFUNCTION(touchexplode_PlayerThink) } } - return FALSE; + return false; } MUTATOR_DEFINITION(mutator_touchexplode) { MUTATOR_HOOK(PlayerPreThink, touchexplode_PlayerThink, CBC_ORDER_ANY); - return FALSE; + return false; }