From 918f6c06a61e777ba200335a3595d90e21bdc6dd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 12 Jul 2015 20:47:44 -0400
Subject: SHERLOCK: RT: Fix Holmes walking when moving to talk to character

---
 engines/sherlock/tattoo/tattoo_people.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/sherlock')

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;
 		}
 	}
 
-- 
cgit v1.2.3