[Scummvm-cvs-logs] scummvm master -> ae885686a562d551ed83e5c45af06f3b92f0500f

[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:
ae885686a5 SHERLOCK: RT: Fix walking with a very close dest


Commit: ae885686a562d551ed83e5c45af06f3b92f0500f
    https://github.com/scummvm/scummvm/commit/ae885686a562d551ed83e5c45af06f3b92f0500f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-27T22:17:49-04:00

Commit Message:
SHERLOCK: RT: Fix walking with a very close dest

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 217064f..b4c96fe 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -556,14 +556,17 @@ void TattooPerson::walkToCoords(const Point32 &destPos, int destDir) {
 			_updateNPCPath = false;
 
 		// Secondary walking wait loop
-		do {
+		bool done = false;
+		while (!done && !_vm->shouldQuit()) {
 			events.wait(1);
 			scene.doBgAnim();
 
 			// See if we're past the initial goto stand sequence
 			for (int idx = 0; idx < _frameNumber; ++idx) {
-				if (_walkSequences[_sequenceNumber][idx] == 0)
+				if (_walkSequences[_sequenceNumber][idx] == 0) {
+					done = true;
 					break;
+				}
 			}
 
 			if (events.kbHit()) {
@@ -576,7 +579,7 @@ void TattooPerson::walkToCoords(const Point32 &destPos, int destDir) {
 					talk._talkToAbort = true;
 				}
 			}
-		} while (!_vm->shouldQuit());
+		}
 
 		if (!isHolmes)
 			_updateNPCPath = true;