aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/objects.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2015-07-02 21:02:05 +0300
committerFilippos Karapetis2015-07-02 21:02:05 +0300
commitb74edc093768b2885dc2a5bd40d748b5baa64605 (patch)
tree7aa85d8e92a1cfc16bec6cadb48a70de627d51df /engines/sherlock/objects.cpp
parent3ad35f760c25aed3036f691c75ebc79d7cbcacae (diff)
downloadscummvm-rg350-b74edc093768b2885dc2a5bd40d748b5baa64605.tar.gz
scummvm-rg350-b74edc093768b2885dc2a5bd40d748b5baa64605.tar.bz2
scummvm-rg350-b74edc093768b2885dc2a5bd40d748b5baa64605.zip
SHERLOCK: SS: Don't multiply the walk coordinates twice
Fixes a regression in Serrated Scalpel from commit dbf82dd92a
Diffstat (limited to 'engines/sherlock/objects.cpp')
-rw-r--r--engines/sherlock/objects.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index a42fce5ea9..12f5a2f90d 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