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

bluegr bluegr at gmail.com
Thu Jul 2 20:03:42 CEST 2015


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:
b74edc0937 SHERLOCK: SS: Don't multiply the walk coordinates twice


Commit: b74edc093768b2885dc2a5bd40d748b5baa64605
    https://github.com/scummvm/scummvm/commit/b74edc093768b2885dc2a5bd40d748b5baa64605
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-07-02T21:02:05+03:00

Commit Message:
SHERLOCK: SS: Don't multiply the walk coordinates twice

Fixes a regression in Serrated Scalpel from commit dbf82dd92a

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index a42fce5..12f5a2f 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -1446,8 +1446,8 @@ void CAnim::load(Common::SeekableReadStream &s, bool isRoseTattoo, uint32 dataOf
 		ADJUST_COORD(_goto[1]);
 	} else {
 		// For Serrated Scalpel, adjust the loaded co-ordinates
-		_goto[0].x = _goto[0].x * FIXED_INT_MULTIPLIER / 100;
-		_goto[0].y = _goto[0].y * FIXED_INT_MULTIPLIER / 100;
+		_goto[0].x = _goto[0].x / 100;
+		_goto[0].y = _goto[0].y / 100;
 	}
 
 	_teleport[0].x = s.readSint16LE();
@@ -1463,8 +1463,8 @@ void CAnim::load(Common::SeekableReadStream &s, bool isRoseTattoo, uint32 dataOf
 		ADJUST_COORD(_teleport[1]);
 	} else {
 		// For Serrated Scalpel, adjust the loaded co-ordinates
-		_teleport[0].x = _teleport[0].x * FIXED_INT_MULTIPLIER / 100;
-		_teleport[0].y = _teleport[0].y * FIXED_INT_MULTIPLIER / 100;
+		_teleport[0].x = _teleport[0].x / 100;
+		_teleport[0].y = _teleport[0].y / 100;
 	}
 
 	// Save offset of data, which is actually inside another table inside the room data file






More information about the Scummvm-git-logs mailing list