mirror of
https://github.com/ZDoom/Raze.git
synced 2024-11-15 08:51:24 +00:00
- fixed badly resolved merge conflict
This commit is contained in:
parent
64b67291bc
commit
cdacf8e470
1 changed files with 1 additions and 1 deletions
|
@ -1660,7 +1660,7 @@ void aiProcessDudes(void)
|
|||
if (pXSprite->aiState->moveFunc)
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue