Merge branch 'bones_was_here/lms_specwarn' into 'master'

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

diff --git a/qcsrc/common/weapons/weapon/fireball.qc b/qcsrc/common/weapons/weapon/fireball.qc
index 2796438378d94ad6c26813be2efcb5e5ad5c89e6..3021843be0da7d12e6f2594b2c61f6169e07b161 100644 (file)
--- a/qcsrc/common/weapons/weapon/fireball.qc
+++ b/qcsrc/common/weapons/weapon/fireball.qc
@@ -79,8 +79,11 @@ void W_Fireball_LaserPlay(entity this, float dt, float dist, float damage, float
 
        RandomSelection_Init();
        for(e = WarpZone_FindRadius(this.origin, dist, true); e; e = e.chain)
-       if(e != this.realowner) if(e.takedamage == DAMAGE_AIM) if(!IS_PLAYER(e) || !this.realowner || DIFF_TEAM(e, this))
        {
+               if(e == this.realowner) continue;
+               if(e.takedamage != DAMAGE_AIM) continue;
+               if(IS_PLAYER(e) && this.realowner && SAME_TEAM(e, this)) continue;
+
                p = e.origin;
                p.x += e.mins.x + random() * (e.maxs.x - e.mins.x);
                p.y += e.mins.y + random() * (e.maxs.y - e.mins.y);
@@ -89,7 +92,7 @@ void W_Fireball_LaserPlay(entity this, float dt, float dist, float damage, float
                if(d < dist)
                {
                        e.fireball_impactvec = p;
-                       RandomSelection_AddEnt(e, 1 / (1 + d), !Fire_IsBurning(e));
+                       RandomSelection_AddEnt(e, 1 / (1 + d), !StatusEffects_active(STATUSEFFECT_Burning, e));
                }
        }
        if(RandomSelection_chosen_ent)