From f1d1d3c7110799c5603d183c8096cca2aaa1a314 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 2 Jul 2015 23:20:13 -0400
Subject: SHERLOCK: SS: Fix loading of 'un-used' anim positions

---
 engines/sherlock/objects.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

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;
-- 
cgit v1.2.3