aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2015-06-08 20:31:16 +0200
committerTorbjörn Andersson2015-06-08 20:34:07 +0200
commit6260c33666a09db8ca4bb72419dc0560d584745f (patch)
tree0621d0caab496ebe5646675aa5fa0b8ad5618b61
parent91d4b8df0fb9238d7b480f3f925703f55cbb871e (diff)
downloadscummvm-rg350-6260c33666a09db8ca4bb72419dc0560d584745f.tar.gz
scummvm-rg350-6260c33666a09db8ca4bb72419dc0560d584745f.tar.bz2
scummvm-rg350-6260c33666a09db8ca4bb72419dc0560d584745f.zip
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.
-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 d27cbeda2e..ce0480a7b2 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];