aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2015-07-02 23:20:13 -0400
committerPaul Gilbert2015-07-02 23:20:13 -0400
commitf1d1d3c7110799c5603d183c8096cca2aaa1a314 (patch)
treec96dcb7f8221adc13f15fd71df11204787c590f7
parent8d7528c4ce1d938e3bf43b69f88a6a90f0e6d017 (diff)
downloadscummvm-rg350-f1d1d3c7110799c5603d183c8096cca2aaa1a314.tar.gz
scummvm-rg350-f1d1d3c7110799c5603d183c8096cca2aaa1a314.tar.bz2
scummvm-rg350-f1d1d3c7110799c5603d183c8096cca2aaa1a314.zip
SHERLOCK: SS: Fix loading of 'un-used' anim positions
-rw-r--r--engines/sherlock/objects.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 9d2110e804..24c91cb0b4 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -1443,7 +1443,7 @@ void CAnim::load(Common::SeekableReadStream &s, bool isRoseTattoo, uint32 dataOf
_goto[1].y = s.readSint16LE();
_goto[1]._facing = s.readSint16LE();
ADJUST_COORD(_goto[1]);
- } else {
+ } else if (_goto[0].x != -1) {
// For Serrated Scalpel, adjust the loaded co-ordinates
_goto[0].x = _goto[0].x / 100;
_goto[0].y = _goto[0].y / 100;
@@ -1460,7 +1460,7 @@ void CAnim::load(Common::SeekableReadStream &s, bool isRoseTattoo, uint32 dataOf
_teleport[1].y = s.readSint16LE();
_teleport[1]._facing = s.readSint16LE();
ADJUST_COORD(_teleport[1]);
- } else {
+ } else if (_teleport[0].x != -1) {
// For Serrated Scalpel, adjust the loaded co-ordinates
_teleport[0].x = _teleport[0].x / 100;
_teleport[0].y = _teleport[0].y / 100;