From e353d386657f361599f83bc7b48df5b4d2a970eb Mon Sep 17 00:00:00 2001 From: "Richard C. Gobeille" Date: Sat, 30 May 2020 04:01:06 -0700 Subject: [PATCH] Duke3d: improve WT FLAMETHROWERFLAME enemy type check I don't expect anyone to make an EDuke32-compatible WT mod where other enemies shoot FLAMETHROWERFLAME, but if they do the behavior will at least be consistent across enemy types. --- source/duke3d/src/actors.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/duke3d/src/actors.cpp b/source/duke3d/src/actors.cpp index 44c094bf7..e63ca649d 100644 --- a/source/duke3d/src/actors.cpp +++ b/source/duke3d/src/actors.cpp @@ -116,9 +116,8 @@ void A_RadiusDamageObject_Internal(int const spriteNum, int const otherSprite, i #ifndef EDUKE32_STANDALONE if (WORLDTOUR && pSprite->picnum == FLAMETHROWERFLAME) { - if (sprite[pSprite->owner].picnum == FIREFLY && pOther->picnum == FIREFLY) - return; - if (sprite[pSprite->owner].picnum == BOSS5 && pOther->picnum == BOSS5) + // enemies in WT don't damage other enemies of the same type with FLAMETHROWERFLAME + if (sprite[pSprite->owner].picnum == pOther->picnum && pOther->picnum != APLAYER) return; } #endif