Commit 0585b829 authored by Richard Gobeille's avatar Richard Gobeille

Duke3d: fix regression with the Devastator's ability to damage sprites in...

Duke3d: fix regression with the Devastator's ability to damage sprites in sectors other than the sector the rocket hit

Fixes terminx/eduke32#62.
parent 6a78dde8
......@@ -268,9 +268,11 @@ void A_RadiusDamage(int const spriteNum, int const blastRadius, int const dmg1,
bfirst_search_init(sectorList, sectorMap, &numSectors, numsectors, pSprite->sectnum);
#ifndef EDUKE32_STANDALONE
int wallDamage = true;
// rockets from the Devastator skip propagating damage to other sectors
if (!FURY && (pSprite->picnum == RPG && pSprite->xrepeat < 11))
goto wallsfinished;
wallDamage = false;
#endif
uint8_t *wallTouched;
......@@ -334,7 +336,10 @@ void A_RadiusDamage(int const spriteNum, int const blastRadius, int const dmg1,
if (pWall->nextwall != -1)
bitmap_set(wallCanSee, pWall->nextwall);
A_DamageWall_Internal(spriteNum, w, { p.x, p.y, pSprite->z }, pSprite->picnum);
#ifndef EDUKE32_STANDALONE
if (wallDamage)
#endif
A_DamageWall_Internal(spriteNum, w, { p.x, p.y, pSprite->z }, pSprite->picnum);
}
int const nextSector = pWall->nextsector;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment