[Scummvm-cvs-logs] scummvm master -> 918f6c06a61e777ba200335a3595d90e21bdc6dd

dreammaster dreammaster at scummvm.org
Mon Jul 13 02:49:22 CEST 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
918f6c06a6 SHERLOCK: RT: Fix Holmes walking when moving to talk to character


Commit: 918f6c06a61e777ba200335a3595d90e21bdc6dd
    https://github.com/scummvm/scummvm/commit/918f6c06a61e777ba200335a3595d90e21bdc6dd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-12T20:47:44-04:00

Commit Message:
SHERLOCK: RT: Fix Holmes walking when moving to talk to character

Changed paths:
    engines/sherlock/tattoo/tattoo_people.cpp



diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index c166df7..7aaa0a0 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;
 		}
 	}
 






More information about the Scummvm-git-logs mailing list