zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 03:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed badly resolved merge conflict

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-12 00:07:24 +02:00
parent 64b67291bc
commit cdacf8e470
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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