diff options
| author | Paul Gilbert | 2015-07-12 20:47:44 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-07-12 20:47:44 -0400 |
| commit | 918f6c06a61e777ba200335a3595d90e21bdc6dd (patch) | |
| tree | c922c073a684f46fafa6e0166a0d169059835a3f | |
| parent | 5b7dc80a6457d612965b6653af91b33a46f52685 (diff) | |
| download | scummvm-rg350-918f6c06a61e777ba200335a3595d90e21bdc6dd.tar.gz scummvm-rg350-918f6c06a61e777ba200335a3595d90e21bdc6dd.tar.bz2 scummvm-rg350-918f6c06a61e777ba200335a3595d90e21bdc6dd.zip | |
SHERLOCK: RT: Fix Holmes walking when moving to talk to character
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_people.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp index c166df7836..7aaa0a082c 100644 --- a/engines/sherlock/tattoo/tattoo_people.cpp +++ b/engines/sherlock/tattoo/tattoo_people.cpp @@ -1049,23 +1049,23 @@ void TattooPerson::walkHolmesToNPC() { // See where Holmes is with respect to the NPC (x coords) if (holmes._position.x < _position.x) { - _walkDest.x = MAX(_position.x / FIXED_INT_MULTIPLIER - imgFrame.sDrawXSize(scaleVal), 0); + holmes._walkDest.x = MAX(_position.x / FIXED_INT_MULTIPLIER - imgFrame.sDrawXSize(scaleVal), 0); } else { - _walkDest.x = MIN(_position.x / FIXED_INT_MULTIPLIER + imgFrame.sDrawXSize(scaleVal) * 2, + holmes._walkDest.x = MIN(_position.x / FIXED_INT_MULTIPLIER + imgFrame.sDrawXSize(scaleVal) * 2, screen._backBuffer1.w() - 1); } // See where Holmes is with respect to the NPC (y coords) if (holmes._position.y < (_position.y - imgFrame.sDrawXSize(scaleVal) * 500)) { - _walkDest.y = MAX(_position.y / FIXED_INT_MULTIPLIER - imgFrame.sDrawXSize(scaleVal) / 2, 0); + holmes._walkDest.y = MAX(_position.y / FIXED_INT_MULTIPLIER - imgFrame.sDrawXSize(scaleVal) / 2, 0); } else { if (holmes._position.y > (_position.y + imgFrame.sDrawXSize(scaleVal) * 500)) { // Holmes is below the NPC - _walkDest.y = MIN(_position.y / FIXED_INT_MULTIPLIER + imgFrame.sDrawXSize(scaleVal) / 2, + holmes._walkDest.y = MIN(_position.y / FIXED_INT_MULTIPLIER + imgFrame.sDrawXSize(scaleVal) / 2, SHERLOCK_SCREEN_HEIGHT - 1); } else { // Holmes is roughly on the same Y as the NPC - _walkDest.y = _position.y / FIXED_INT_MULTIPLIER; + holmes._walkDest.y = _position.y / FIXED_INT_MULTIPLIER; } } |