diff options
author | Paul Gilbert | 2015-05-25 08:21:57 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-05-25 08:21:57 -0400 |
commit | bcb8c02ba178b79b8352bb58f38f429f7f39928c (patch) | |
tree | 0efcf7dd6bb9b8b664962c250e4be48220b76672 /engines/sherlock/people.cpp | |
parent | 40afa013696a5cebd88c3fd566175ca001d6f310 (diff) | |
download | scummvm-rg350-bcb8c02ba178b79b8352bb58f38f429f7f39928c.tar.gz scummvm-rg350-bcb8c02ba178b79b8352bb58f38f429f7f39928c.tar.bz2 scummvm-rg350-bcb8c02ba178b79b8352bb58f38f429f7f39928c.zip |
SHERLOCK: Free freeing and resetting People list
Diffstat (limited to 'engines/sherlock/people.cpp')
-rw-r--r-- | engines/sherlock/people.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp index c03dde80ad..083e3c8d4c 100644 --- a/engines/sherlock/people.cpp +++ b/engines/sherlock/people.cpp @@ -164,14 +164,17 @@ void People::reset() { // Load the default walk sequences p._oldWalkSequence = -1; - p._walkSequences.resize(MAX_HOLMES_SEQUENCE); - for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx) { - p._walkSequences[idx]._sequences.clear(); - - const byte *pSrc = &CHARACTER_SEQUENCES[idx][0]; - do { - p._walkSequences[idx]._sequences.push_back(*pSrc); - } while (*pSrc++); + + if (IS_SERRATED_SCALPEL) { + p._walkSequences.resize(MAX_HOLMES_SEQUENCE); + for (int seqIdx = 0; seqIdx < MAX_HOLMES_SEQUENCE; ++seqIdx) { + p._walkSequences[seqIdx]._sequences.clear(); + + const byte *pSrc = &CHARACTER_SEQUENCES[seqIdx][0]; + do { + p._walkSequences[seqIdx]._sequences.push_back(*pSrc); + } while (*pSrc++); + } } } @@ -259,6 +262,8 @@ bool People::freeWalk() { if (_data[idx]._walkLoaded) { delete _data[idx]._images; _data[idx]._images = nullptr; + + _data[idx]._walkLoaded = false; result = true; } } |