zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-21 19:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use a wrapper function to check for the radial damage event.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-28 18:08:03 +02:00
parent 7a65cc46d0
commit 791240786d
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/exhumed/src/aistuff.h
View file

@ -399,6 +399,8 @@ struct RunListEvent
int nRadialDamage; // Radial damage needs a bit more info. int nRadialDamage; // Radial damage needs a bit more info.
int nDamageRadius; int nDamageRadius;
DExhumedActor* pRadialActor; DExhumedActor* pRadialActor;
bool isRadialEvent() const { return nMessage == EMessageType::RadialDamage; }
}; };
struct ExhumedAI struct ExhumedAI

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

@ -440,7 +440,7 @@ void AIAnubis::Damage(RunListEvent* ev)
if (nAction < 11) if (nAction < 11)
{ {
DropMagic(ap); DropMagic(ap);
ap->nAction = (ev->nMessage == EMessageType::RadialDamage) + 11; ap->nAction = int(ev->isRadialEvent()) + 11;
ap->nFrame = 0; ap->nFrame = 0;
} }
} }

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

@ -287,7 +287,7 @@ void AIFish::Damage(RunListEvent* ev)
pSprite->cstat &= 0xFEFE; pSprite->cstat &= 0xFEFE;
if (ev->nMessage == EMessageType::Damage) if (!ev->isRadialEvent())
{ {
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {

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

@ -140,7 +140,7 @@ void AILion::Damage(RunListEvent* ev)
{ {
DropMagic(pActor); DropMagic(pActor);
if (ev->nMessage == EMessageType::RadialDamage) if (ev->isRadialEvent())
{ {
pActor->nAction = 11; pActor->nAction = 11;
} }

4
source/games/exhumed/src/player.cpp
View file

@ -650,7 +650,7 @@ void AIPlayer::Damage(RunListEvent* ev)
return; return;
} }
DExhumedActor* pActor2 = (ev->nMessage != EMessageType::RadialDamage) ? ev->pOtherActor : ev->pRadialActor->pTarget; DExhumedActor* pActor2 = (!ev->isRadialEvent()) ? ev->pOtherActor : ev->pRadialActor->pTarget;
// ok continue case 0x80000 as normal, loc_1C57C // ok continue case 0x80000 as normal, loc_1C57C
if (!PlayerList[nPlayer].nHealth) { if (!PlayerList[nPlayer].nHealth) {
@ -726,7 +726,7 @@ void AIPlayer::Damage(RunListEvent* ev)
PlayerList[nPlayer].nPlayerScore--; PlayerList[nPlayer].nPlayerScore--;
} }
if (ev->nMessage == EMessageType::RadialDamage) if (ev->isRadialEvent())
{ {
for (int i = 122; i <= 131; i++) for (int i = 122; i <= 131; i++)
{ {