From 1162954b036ea5f986dd4b1d096aa1f831988471 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Sun, 16 Apr 2023 18:44:17 +1000 Subject: [PATCH] - Exhumed: Move AISpider's null chunk texture check into the getter. * It's needed for the rat as well... --- source/games/exhumed/src/sequence.h | 2 +- source/games/exhumed/src/spider.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/games/exhumed/src/sequence.h b/source/games/exhumed/src/sequence.h index 57ff1d84c..02b5b4115 100644 --- a/source/games/exhumed/src/sequence.h +++ b/source/games/exhumed/src/sequence.h @@ -43,7 +43,7 @@ struct SeqFrame const FTextureID getFirstTexID() const { - return chunks[0].tex; + return chunks.Size() ? chunks[0].tex : FNullTextureID(); } const void playSound(DExhumedActor* const pActor) const diff --git a/source/games/exhumed/src/spider.cpp b/source/games/exhumed/src/spider.cpp index 016142e5b..0344e3ad1 100644 --- a/source/games/exhumed/src/spider.cpp +++ b/source/games/exhumed/src/spider.cpp @@ -122,7 +122,7 @@ void AISpider::Tick(RunListEvent* ev) const auto& spiderSeq = getSequence(spp->nSeqFile, SpiderSeq[nAction].nSeqId); const auto& seqFrame = spiderSeq.frames[spp->nFrame]; - spp->spr.setspritetexture(spp->nFrame < 9 ? seqFrame.getFirstTexID() : FNullTextureID()); + spp->spr.setspritetexture(seqFrame.getFirstTexID()); seqFrame.playSound(spp);