zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-26 05:51:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Exhumed: fix crash on bad player animation sequence.

Browse source
This commit is contained in:
Christoph Oelckers 2023-11-19 08:10:38 +01:00
parent 86584b54ec
commit 0666e3372c
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/exhumed/src/player.cpp
View file

@ -1928,8 +1928,10 @@ static void doPlayerActionSequence(DExhumedPlayer* const pPlayer)
const auto pPlayerActor = pPlayer->GetActor(); const auto pPlayerActor = pPlayer->GetActor();
const auto playerSeq = getSequence(pPlayerActor->nSeqFile, PlayerSeq[pPlayerActor->nAction].nSeqId); const auto playerSeq = getSequence(pPlayerActor->nSeqFile, PlayerSeq[pPlayerActor->nAction].nSeqId);
const auto& seqFrame = playerSeq->frames[pPlayerActor->nFrame]; if (playerSeq == nullptr) return;
const auto seqSize = playerSeq->frames.Size(); const auto seqSize = playerSeq->frames.Size();
if (pPlayerActor->nFrame >= seqSize) pPlayerActor->nFrame = seqSize - 1;
const auto& seqFrame = playerSeq->frames[pPlayerActor->nFrame];
seqFrame.playSound(pPlayerActor); seqFrame.playSound(pPlayerActor);
pPlayerActor->nFrame++; pPlayerActor->nFrame++;

4
source/games/exhumed/src/sequence.h
View file

@ -88,7 +88,9 @@ TArray<Seq>* getFileSeqs(const FName nSeqFile);
inline Seq* getSequence(const FName nSeqFile, const unsigned nSeqIndex = 0) inline Seq* getSequence(const FName nSeqFile, const unsigned nSeqIndex = 0)
{ {
return getFileSeqs(nSeqFile)->Data(nSeqIndex); auto seq = getFileSeqs(nSeqFile);
if (nSeqIndex >= seq->Size()) return nullptr;
return seq->Data(nSeqIndex);
} }
END_PS_NS END_PS_NS