zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-01 14:11:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Fixes terminx/eduke32#62.
This commit is contained in:
Richard C. Gobeille 2020-06-08 12:38:24 -07:00 committed by Christoph Oelckers
parent a5c9a702e9
commit 28911435d9
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/duke3d/src/actors.cpp
View file

@ -276,9 +276,11 @@ void A_RadiusDamage(int const spriteNum, int const blastRadius, int const dmg1,
bfirst_search_init(sectorList, sectorMap, &numSectors, numsectors, pSprite->sectnum); bfirst_search_init(sectorList, sectorMap, &numSectors, numsectors, pSprite->sectnum);
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
int wallDamage = true;
// rockets from the Devastator skip propagating damage to other sectors // rockets from the Devastator skip propagating damage to other sectors
if (!FURY && (pSprite->picnum == RPG && pSprite->xrepeat < 11)) if (!FURY && (pSprite->picnum == RPG && pSprite->xrepeat < 11))
goto wallsfinished; wallDamage = false;
#endif #endif
uint8_t *wallTouched; uint8_t *wallTouched;
@ -342,6 +344,9 @@ void A_RadiusDamage(int const spriteNum, int const blastRadius, int const dmg1,
if (pWall->nextwall != -1) if (pWall->nextwall != -1)
bitmap_set(wallCanSee, pWall->nextwall); bitmap_set(wallCanSee, pWall->nextwall);
#ifndef EDUKE32_STANDALONE
if (wallDamage)
#endif
A_DamageWall_Internal(spriteNum, w, { p.x, p.y, pSprite->z }, pSprite->picnum); A_DamageWall_Internal(spriteNum, w, { p.x, p.y, pSprite->z }, pSprite->picnum);
} }