- fixed badly resolved merge conflict

This commit is contained in:
Christoph Oelckers 2021-10-12 00:07:24 +02:00
parent 64b67291bc
commit cdacf8e470

View file

@ -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);
}