[Scummvm-git-logs] scummvm master -> e9fde87cf225380cbd459c7e28c9f24b28f3cf33

[whiterandrek]

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:
e9fde87cf2 PINK: fixed bug when in walking state you choose another location


Commit: e9fde87cf225380cbd459c7e28c9f24b28f3cf33
    https://github.com/scummvm/scummvm/commit/e9fde87cf225380cbd459c7e28c9f24b28f3cf33
Author: whiterandrek (whiterandrek at gmail.com)
Date: 2018-08-02T21:09:27+03:00

Commit Message:
PINK: fixed bug when in walking state you choose another location

Changed paths:
    engines/pink/objects/walk/walk_mgr.cpp


diff --git a/engines/pink/objects/walk/walk_mgr.cpp b/engines/pink/objects/walk/walk_mgr.cpp
index ab22192..c07932d 100644
--- a/engines/pink/objects/walk/walk_mgr.cpp
+++ b/engines/pink/objects/walk/walk_mgr.cpp
@@ -60,9 +60,6 @@ void WalkMgr::toConsole() {
 }
 
 void WalkMgr::start(WalkLocation *destination) {
-	if (_isWalking)
-		return;
-
 	if (_current.name.empty()) {
 		_current.name = _locations[0]->getName();
 		_current.coords = getLocationCoordinates(_locations[0]->getName());
@@ -70,6 +67,9 @@ void WalkMgr::start(WalkLocation *destination) {
 
 	_destination = destination;
 
+	if (_isWalking)
+		return;
+
 	if (_current.name == _destination->getName()) {
 		end();
 	} else {