[Scummvm-cvs-logs] scummvm master -> 142812e843f9ecb8fbe76b3d32e89b5a17674511

[dreammaster]

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:
142812e843 SHERLOCK: RT: Fix walking with segments more than 10 steps long


Commit: 142812e843f9ecb8fbe76b3d32e89b5a17674511
    https://github.com/scummvm/scummvm/commit/142812e843f9ecb8fbe76b3d32e89b5a17674511
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-14T21:37:39-04:00

Commit Message:
SHERLOCK: RT: Fix walking with segments more than 10 steps long

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



diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index 30a87ce..b582b86 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -128,7 +128,7 @@ void TattooPerson::adjustSprite() {
 		setWalking();
 	} else if (_type == CHARACTER && _walkCount) {
 		if (_walkCount > 10) {
-			_walkDest = _walkTo.front();
+			_walkDest = _nextDest;
 			setWalking();
 		}
 
@@ -315,6 +315,7 @@ void TattooPerson::setWalking() {
 	TattooScene &scene = *(TattooScene *)_vm->_scene;
 	int oldDirection, oldFrame;
 	Common::Point delta;
+	_nextDest = _walkDest;
 
 	// Flag that player has now walked in the scene
 	scene._walkedInScene = true;
diff --git a/engines/sherlock/tattoo/tattoo_people.h b/engines/sherlock/tattoo/tattoo_people.h
index 5fb94cc..eff9038 100644
--- a/engines/sherlock/tattoo/tattoo_people.h
+++ b/engines/sherlock/tattoo/tattoo_people.h
@@ -73,6 +73,8 @@ enum TattooSequences {
 
 class TattooPerson: public Person {
 private:
+	Point32 _nextDest;
+private:
 	bool checkCollision() const;
 
 	/**