From c9d391634d0354fb61a963a04a468c048f71035c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 20 Oct 2021 23:54:26 +0200 Subject: [PATCH] - some missing queen bits. --- source/games/exhumed/src/queen.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source/games/exhumed/src/queen.cpp b/source/games/exhumed/src/queen.cpp index 7a03f22d5..37ca4dc28 100644 --- a/source/games/exhumed/src/queen.cpp +++ b/source/games/exhumed/src/queen.cpp @@ -659,8 +659,9 @@ void AIQueenEgg::RadialDamage(RunListEvent* ev) Egg* pEgg = &QueenEgg[nEgg]; auto pActor = pEgg->pActor; auto pSprite = &pActor->s(); + auto pRadial = &ev->pRadialActor->s(); - if (sprite[nRadialSpr].statnum != 121 && (pSprite->cstat & 0x101) != 0) + if (pRadial->statnum != 121 && (pSprite->cstat & 0x101) != 0) { int nDamage = runlist_CheckRadialDamage(pActor); @@ -1041,10 +1042,10 @@ void AIQueenHead::Tick(RunListEvent* ev) void AIQueenHead::RadialDamage(RunListEvent* ev) { auto pSprite = &QueenHead.pActor->s(); + auto pRadial = &ev->pRadialActor->s(); - if (sprite[nRadialSpr].statnum != 121 && (pSprite->cstat & 0x101) != 0) + if (pRadial->statnum != 121 && (pSprite->cstat & 0x101) != 0) { - ev->nDamage = runlist_CheckRadialDamage(QueenHead.pActor); if (ev->nDamage) Damage(ev); } @@ -1456,8 +1457,9 @@ void AIQueen::RadialDamage(RunListEvent* ev) assert(nQueen >= 0 && nQueen < kMaxQueens); auto pActor = QueenList[nQueen].pActor; auto pSprite = &pActor->s(); + auto pRadial = &ev->pOtherActor->s(); - if (sprite[nRadialSpr].statnum != 121 && (pSprite->cstat & 0x101) != 0) + if (pRadial->statnum != 121 && (pSprite->cstat & 0x101) != 0) { ev->nDamage = runlist_CheckRadialDamage(pActor); if (ev->nDamage) Damage(ev);