From 275064ad23a46d5c034c75201249511e6026556d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 14 Jun 2015 11:58:28 -0400
Subject: SHERLOCK: RT: Fix player movement whilst walking

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

diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index a8c906a41a..3d472bc9d2 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -97,10 +97,12 @@ void TattooPerson::adjustSprite() {
 
 		if (!_walkCount) {
 			// If there are remaining points to walk, move to the next one
-			people._walkDest = _walkTo.pop();
-			setWalking();
-		} else {
-			gotoStand();
+			if (!_walkTo.empty()) {
+				people._walkDest = _walkTo.pop();
+				setWalking();
+			} else {
+				gotoStand();
+			}
 		}
 	}
 
-- 
cgit v1.2.3