[Scummvm-cvs-logs] scummvm master -> 275064ad23a46d5c034c75201249511e6026556d

dreammaster dreammaster at scummvm.org
Sun Jun 14 17:59:34 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:
275064ad23 SHERLOCK: RT: Fix player movement whilst walking


Commit: 275064ad23a46d5c034c75201249511e6026556d
    https://github.com/scummvm/scummvm/commit/275064ad23a46d5c034c75201249511e6026556d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-14T11:58:28-04:00

Commit Message:
SHERLOCK: RT: Fix player movement whilst walking

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 a8c906a..3d472bc 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();
+			}
 		}
 	}
 






More information about the Scummvm-git-logs mailing list