X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Fturret%2Fhellion_weapon.qc;h=1c12a33c65559181d455df5cb2f90381bb1008bf;hb=e2206feb6fec163ffee9c87d50d8d9580393cd88;hp=9e737ea6cf12e921fb2e48828b739ef382a5f0e3;hpb=8ba1f6c672361186033b8bebc3be677ac94bd4da;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/turrets/turret/hellion_weapon.qc b/qcsrc/common/turrets/turret/hellion_weapon.qc index 9e737ea6c..1c12a33c6 100644 --- a/qcsrc/common/turrets/turret/hellion_weapon.qc +++ b/qcsrc/common/turrets/turret/hellion_weapon.qc @@ -1,7 +1,5 @@ #include "hellion_weapon.qh" -#ifdef IMPLEMENTATION - #ifdef SVQC float autocvar_g_turrets_unit_hellion_shot_speed_gain; @@ -15,7 +13,7 @@ METHOD(HellionAttack, wr_think, void(entity thiswep, entity actor, .entity weapo if (!isPlayer || weapon_prepareattack(thiswep, actor, weaponentity, false, WEP_CVAR_PRI(electro, refire))) { if (isPlayer) { turret_initparams(actor); - W_SetupShot_Dir(actor, v_forward, false, 0, SND_HellionAttack_FIRE, CH_WEAPON_B, 0); + W_SetupShot_Dir(actor, weaponentity, v_forward, false, 0, SND_HellionAttack_FIRE, CH_WEAPON_B, 0, DEATH_TURRET_HELLION.m_id); actor.tur_shotdir_updated = w_shotdir; actor.tur_shotorg = w_shotorg; actor.tur_head = actor; @@ -33,7 +31,6 @@ METHOD(HellionAttack, wr_think, void(entity thiswep, entity actor, .entity weapo te_explosion (missile.origin); setthink(missile, turret_hellion_missile_think); missile.nextthink = time; - missile.flags = FL_PROJECTILE; missile.max_health = time + 9; missile.tur_aimpos = randomvec() * 128; missile.missile_flags = MIF_SPLASH | MIF_PROXY | MIF_GUIDED_HEAT; @@ -104,5 +101,3 @@ void turret_hellion_missile_think(entity this) } #endif - -#endif