X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Fturret%2Fplasma.qc;h=89ddfbd4f1ca6a28df7f9d45339b016d01923144;hb=524d2e52f82e986764687989ec0075719a4c4cee;hp=ed7d4f16088636f71bce125bda130dea77be921a;hpb=cbca1a79315fe08c4796273a490a4d12b7d3291d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/turrets/turret/plasma.qc b/qcsrc/common/turrets/turret/plasma.qc index ed7d4f160..89ddfbd4f 100644 --- a/qcsrc/common/turrets/turret/plasma.qc +++ b/qcsrc/common/turrets/turret/plasma.qc @@ -1,17 +1,15 @@ #include "plasma.qh" -#ifdef IMPLEMENTATION - #ifdef SVQC spawnfunc(turret_plasma) { if (!turret_initialize(this, TUR_PLASMA)) delete(this); } METHOD(PlasmaTurret, tr_attack, void(PlasmaTurret this, entity it)) { - if(g_instagib) + if(MUTATOR_IS_ENABLED(mutator_instagib)) { .entity weaponentity = weaponentities[0]; // TODO: unhardcode - FireRailgunBullet (it, weaponentity, it.tur_shotorg, it.tur_shotorg + it.tur_shotdir_updated * MAX_SHOT_DISTANCE, 10000000000, + FireRailgunBullet (it, weaponentity, it.tur_shotorg, it.tur_shotorg + it.tur_shotdir_updated * max_shot_distance, 10000000000, 800, 0, 0, 0, 0, DEATH_TURRET_PLASMA.m_id); Send_Effect(EFFECT_VORTEX_MUZZLEFLASH, it.tur_shotorg, it.tur_shotdir_updated * 1000, 1); @@ -46,4 +44,3 @@ METHOD(PlasmaTurret, tr_setup, void(PlasmaTurret this, entity it)) } #endif -#endif