[Scummvm-cvs-logs] scummvm master -> f1d1d3c7110799c5603d183c8096cca2aaa1a314

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f1d1d3c711 SHERLOCK: SS: Fix loading of 'un-used' anim positions


Commit: f1d1d3c7110799c5603d183c8096cca2aaa1a314
    https://github.com/scummvm/scummvm/commit/f1d1d3c7110799c5603d183c8096cca2aaa1a314
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-02T23:20:13-04:00

Commit Message:
SHERLOCK: SS: Fix loading of 'un-used' anim positions

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 9d2110e..24c91cb 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;