From cdacf8e470d03f9bbb5fab19b78253f4d3b8666b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 12 Oct 2021 00:07:24 +0200 Subject: [PATCH] - fixed badly resolved merge conflict --- source/games/blood/src/ai.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/games/blood/src/ai.cpp b/source/games/blood/src/ai.cpp index 1d23125c5..cc78a1d20 100644 --- a/source/games/blood/src/ai.cpp +++ b/source/games/blood/src/ai.cpp @@ -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); }