zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 13:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Duke3d: fix APLAYER radius damage distance calculation regression

Browse source 
Fixes #20.
This commit is contained in:
Richard C. Gobeille 2020-04-29 19:07:59 -07:00 committed by Christoph Oelckers
parent f5788c331e
commit b19d258870
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -154,9 +154,6 @@ void A_RadiusDamageObject_Internal(int const spriteNum, int const otherSprite, i
|| (pSprite->picnum == MORTER && otherSprite == pSprite->owner))
return;
#endif
if (pOther->picnum == APLAYER)
spriteDist = FindDistance3D(pSprite->x - pOther->x, pSprite->y - pOther->y, pSprite->z - (pOther->z - PHEIGHT));
if (spriteDist >= blastRadius || !cansee(pOther->x, pOther->y, pOther->z - ZOFFSET3, pOther->sectnum,
pSprite->x, pSprite->y, pSprite->z - ZOFFSET4, pSprite->sectnum))
return;
@ -354,7 +351,9 @@ SKIPWALLCHECK:
if (bitmap_test(g_radiusDmgStatnums, pDamage->statnum))
{
int const spriteDist = dist(pSprite, pDamage);
int const spriteDist = (pDamage->picnum == APLAYER)
? FindDistance3D(pSprite->x - pDamage->x, pSprite->y - pDamage->y, pSprite->z - (pDamage->z - PHEIGHT))
: dist(pSprite, pDamage);
if (spriteDist < blastRadius)
A_RadiusDamageObject_Internal(spriteNum, damageSprite, blastRadius, spriteDist, randomZOffset, dmg1, dmg2, dmg3, dmg4);