Give W_SetupShot a deathtype parameter, fixes some ugly hacks

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / blaster.qc

diff --git a/qcsrc/common/weapons/weapon/blaster.qc b/qcsrc/common/weapons/weapon/blaster.qc
index 2189c1db209d1d1d68b57949bdd8a5103183bb17..ec1f070e3e2be1f24167c3432b50ce4909870158 100644 (file)
--- a/qcsrc/common/weapons/weapon/blaster.qc
+++ b/qcsrc/common/weapons/weapon/blaster.qc
@@ -18,6 +18,7 @@ void W_Blaster_Touch(entity this, entity toucher)
                NULL,
                this.blaster_force,
                this.projectiledeathtype,
+               this.weaponentity_fld,
                toucher
        );
 
@@ -48,7 +49,7 @@ void W_Blaster_Attack(
 {
        vector s_forward = v_forward * cos(atk_shotangle * DEG2RAD) + v_up * sin(atk_shotangle * DEG2RAD);
 
-       W_SetupShot_Dir(actor, weaponentity, s_forward, false, 3, SND_LASERGUN_FIRE, CH_WEAPON_B, atk_damage);
+       W_SetupShot_Dir(actor, weaponentity, s_forward, false, 3, SND_LASERGUN_FIRE, CH_WEAPON_B, atk_damage, atk_deathtype);
        Send_Effect(EFFECT_BLASTER_MUZZLEFLASH, w_shotorg, w_shotdir * 1000, 1);
 
        entity missile = new(blasterbolt);
@@ -88,6 +89,7 @@ void W_Blaster_Attack(
        IL_PUSH(g_bot_dodge, missile);
        missile.missile_flags = MIF_SPLASH;
        missile.projectiledeathtype = atk_deathtype;
+       missile.weaponentity_fld = weaponentity;
        setthink(missile, W_Blaster_Think);
        missile.nextthink = time + atk_delay;