[Scummvm-cvs-logs] scummvm master -> 6260c33666a09db8ca4bb72419dc0560d584745f

[eriktorbjorn]

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:
6260c33666 SHERLOCK: Fix checkSprite() regression from FIXED_INT_MULTIPLIER


Commit: 6260c33666a09db8ca4bb72419dc0560d584745f
    https://github.com/scummvm/scummvm/commit/6260c33666a09db8ca4bb72419dc0560d584745f
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-08T20:34:07+02:00

Commit Message:
SHERLOCK: Fix checkSprite() regression from FIXED_INT_MULTIPLIER

I think these 100 should be FIXED_INT_MULTIPLIER, which was changed
to 1000 recently to accomodate for The Case of the Rose Tattoo.
Bizarrely, the noticeable regression from this was that the first
few paragraphs of the journal (referencing events in the intro)
were not recorded.

I trust someone will let me know if I got it wrong.

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index d27cbed..ce0480a 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -320,8 +320,8 @@ void Sprite::checkSprite() {
 
 	if (!talk._talkCounter && _type == CHARACTER) {
 		pt = _walkCount ? _position + _delta : _position;
-		pt.x /= 100;
-		pt.y /= 100;
+		pt.x /= FIXED_INT_MULTIPLIER;
+		pt.y /= FIXED_INT_MULTIPLIER;
 
 		for (uint idx = 0; idx < scene._bgShapes.size() && !talk._talkToAbort; ++idx) {
 			Object &obj = scene._bgShapes[idx];