zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-20 18:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use GetIndex function where appropriate.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-11 00:32:15 +01:00
parent ad95033c64
commit 08bc31e6e2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/blood/src/actor.cpp
View file

@ -5512,7 +5512,7 @@ void actExplodeSprite(DBloodActor* actor)
nType = kExplosionFireball;
seqSpawn(9, actor, -1);
if (Chance(0x8000)) pSprite->cstat |= 4;
sfxPlay3DSound(actor, 306, 24 + (pSprite->index & 3), FX_GlobalChannel); // ouch...
sfxPlay3DSound(actor, 306, 24 + (actor->GetIndex() & 3), FX_GlobalChannel);
GibSprite(actor, GIBTYPE_5, nullptr, nullptr);
break;
@ -5832,7 +5832,7 @@ static void actCheckThings()
}
actAirDrag(actor, 128);
if (((pSprite->index >> 8) & 15) == (gFrameCount & 15) && (pSprite->flags & 2)) pSprite->flags |= 4;
if (((actor->GetIndex() >> 8) & 15) == (gFrameCount & 15) && (pSprite->flags & 2)) pSprite->flags |= 4;
if ((pSprite->flags & 4) || actor->xvel || actor->yvel || actor->zvel || velFloor[pSprite->sectnum] || velCeil[pSprite->sectnum])
{
Collision hit = MoveThing(actor);

2
source/games/blood/src/ai.cpp
View file

@ -1662,7 +1662,7 @@ void aiProcessDudes(void)
if (pXSprite->aiState->moveFunc)
pXSprite->aiState->moveFunc(actor);
if (pXSprite->aiState->thinkFunc && (gFrameCount & 3) == (pSprite->index & 3)) // ouch, ouch! :(
if (pXSprite->aiState->thinkFunc && (gFrameCount & 3) == (actor->GetIndex() & 3))
pXSprite->aiState->thinkFunc(actor);
}

2
source/games/blood/src/aiunicult.cpp
View file

@ -2522,7 +2522,7 @@ bool genDudePrepare(DBloodActor* actor, int propId)
case kGenDudeSeqReserved7:
case kGenDudeSeqReserved8:
/*if (getSequence(i)) {
viewSetSystemMessage("Found reserved SEQ animation (%d) for custom dude #%d!", i, pSprite->index);
viewSetSystemMessage("Found reserved SEQ animation (%d) for custom dude #%d!", i, actor->GetIndex());
viewSetSystemMessage("Using reserved animation is not recommended.");
viewSetSystemMessage("SEQ base id: %d", seqStartId);
}*/