diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/sherlock/scalpel/scalpel_talk.cpp | 4 | ||||
-rw-r--r-- | engines/sherlock/talk.cpp | 4 | ||||
-rw-r--r-- | engines/sherlock/tattoo/tattoo_talk.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp index 2d9db77552..23937decd5 100644 --- a/engines/sherlock/scalpel/scalpel_talk.cpp +++ b/engines/sherlock/scalpel/scalpel_talk.cpp @@ -296,8 +296,8 @@ OpcodeReturn ScalpelTalk::cmdGotoScene(const byte *&str) { if (scene._goToScene != 100) { // Not going to the map overview map._oldCharPoint = scene._goToScene; - map._overPos.x = map[scene._goToScene].x * 100 - 600; - map._overPos.y = map[scene._goToScene].y * 100 + 900; + map._overPos.x = (map[scene._goToScene].x - 6) * FIXED_INT_MULTIPLIER; + map._overPos.y = (map[scene._goToScene].y + 9) * FIXED_INT_MULTIPLIER; // Run a canimation? if (str[2] > 100) { diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index e11fc66447..d1e92a7fa5 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -1481,8 +1481,8 @@ OpcodeReturn Talk::cmdWalkToCoords(const byte *&str) { People &people = *_vm->_people; ++str; - people.walkToCoords(Common::Point(((str[0] - 1) * 256 + str[1] - 1) * 100, - str[2] * 100), str[3] - 1); + people.walkToCoords(Common::Point(((str[0] - 1) * 256 + str[1] - 1) * FIXED_INT_MULTIPLIER, + str[2] * FIXED_INT_MULTIPLIER), str[3] - 1); if (_talkToAbort) return RET_EXIT; diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp index 92e64a87cd..3a066712f5 100644 --- a/engines/sherlock/tattoo/tattoo_talk.cpp +++ b/engines/sherlock/tattoo/tattoo_talk.cpp @@ -336,7 +336,7 @@ OpcodeReturn TattooTalk::cmdSetNPCPosition(const byte *&str) { posX = -1 * (posX - 16384); int32 posY = (str[2] - 1) * 256 + str[3] - 1; - people[npcNum]._position = Point32(posX * 1000, posY * 1000); + people[npcNum]._position = Point32(posX * FIXED_INT_MULTIPLIER, posY * FIXED_INT_MULTIPLIER); if (person._seqTo && person._walkLoaded) { person._walkSequences[person._sequenceNumber]._sequences[person._frameNumber] = person._seqTo; person._seqTo = 0; |