diff options
| author | Paul Gilbert | 2015-08-29 21:38:08 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-08-29 21:38:08 -0400 |
| commit | 2c28a1e12d5d4cdfbf585a2d9995f9879e3e7c83 (patch) | |
| tree | 78f320e7313450be831d1abc0b2eb0fe4089fe2e /engines | |
| parent | b11530d87c1c2648dd68f9b9669aa24fe785264c (diff) | |
| download | scummvm-rg350-2c28a1e12d5d4cdfbf585a2d9995f9879e3e7c83.tar.gz scummvm-rg350-2c28a1e12d5d4cdfbf585a2d9995f9879e3e7c83.tar.bz2 scummvm-rg350-2c28a1e12d5d4cdfbf585a2d9995f9879e3e7c83.zip | |
SHERLOCK: RT: Fix crash visiting Lawton's house after he's fled
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sherlock/objects.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index b2ffdfbacc..093f666a46 100644 --- a/engines/sherlock/objects.cpp +++ b/engines/sherlock/objects.cpp @@ -350,10 +350,10 @@ bool BaseObject::checkEndOfSequence() { if (_type == REMOVE || _type == INVALID) return false; - if (_sequences[_frameNumber] == 0 || _frameNumber >= checkFrame) { + if (_frameNumber < 0 || _frameNumber >= checkFrame || _sequences[_frameNumber] == 0) { result = true; - if (_frameNumber >= (checkFrame - 1)) { + if (_frameNumber < 0 || _frameNumber >= (checkFrame - 1)) { _frameNumber = START_FRAME; } else { // Determine next sequence to use |