zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed two bad actor references in Exhumed's radial damage code.

Browse source 
The radial source is passed through pRadialActor, not pObjActor.
This commit is contained in:
Christoph Oelckers 2021-11-30 22:44:54 +01:00
parent 00d54fa11a
commit 5bb114ba6e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/exhumed/src/grenade.cpp
View file

@ -346,7 +346,7 @@ void AIGrenade::RadialDamage(RunListEvent* ev)
auto pActor = ev->pObjActor; auto pActor = ev->pObjActor;
if (!pActor) return; if (!pActor) return;
if (pActor != ev->pOtherActor && !pActor->nFrame) if (pActor != ev->pRadialActor && !pActor->nFrame)
{ {
if (runlist_CheckRadialDamage(pActor) > 280) if (runlist_CheckRadialDamage(pActor) > 280)
{ {

2
source/games/exhumed/src/queen.cpp
View file

@ -1443,7 +1443,7 @@ void AIQueen::RadialDamage(RunListEvent* ev)
assert(nQueen >= 0 && nQueen < kMaxQueens); assert(nQueen >= 0 && nQueen < kMaxQueens);
auto pActor = QueenList[nQueen].pActor; auto pActor = QueenList[nQueen].pActor;
auto pSprite = &pActor->s(); auto pSprite = &pActor->s();
auto pRadial = &ev->pOtherActor->s(); auto pRadial = &ev->pRadialActor->s();
if (pRadial->statnum != 121 && (pSprite->cstat & 0x101) != 0) if (pRadial->statnum != 121 && (pSprite->cstat & 0x101) != 0)
{ {