From a4393d46b203c183d26f931e247f30d760b6ad0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20=C5=A0palek?= <spalek@google.com>
Date: Sun, 8 Nov 2009 06:30:10 +0000
Subject: [PATCH] Do not immediately clear the path when it has just 1 vertex.

This fixes the previous bugfix, which causes that I could not re-run the same
program (e.g., by repeatedly clicking on the hollow tree) if the hero did not
move at least one pixel.

svn-id: r45747
---
 engines/draci/game.cpp    |  2 +-
 engines/draci/walking.cpp | 10 ++++++++--
 engines/draci/walking.h   |  6 ++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp
index c87034bdea4..daad892b6cf 100644
--- a/engines/draci/game.cpp
+++ b/engines/draci/game.cpp
@@ -443,7 +443,7 @@ void Game::advanceAnimationsAndTestLoopExit() {
 	// proper timing.
 	bool walkingFinished = false;
 	if (_walkingState.isActive()) {
-		walkingFinished = !_walkingState.continueWalking();
+		walkingFinished = !_walkingState.continueWalkingOrClearPath();
 	}
 
 	// Advance animations (this may also call setExitLoop(true) in the
diff --git a/engines/draci/walking.cpp b/engines/draci/walking.cpp
index f9e29da8813..6f2e2950007 100644
--- a/engines/draci/walking.cpp
+++ b/engines/draci/walking.cpp
@@ -493,6 +493,14 @@ void WalkingState::callback() {
 	_vm->_mouse->cursorOn();
 }
 
+bool WalkingState::continueWalkingOrClearPath() {
+	const bool stillWalking = continueWalking();
+	if (!stillWalking) {
+		_path.clear();
+	}
+	return stillWalking;
+}
+
 bool WalkingState::continueWalking() {
 	const GameObject *dragon = _vm->_game->getObject(kDragonObject);
 	const Movement movement = static_cast<Movement> (_vm->_game->playingObjectAnimation(dragon));
@@ -513,7 +521,6 @@ bool WalkingState::continueWalking() {
 	// has just 1 vertex and startWalking() leaves the path open.
 	// Finishing and nontrivial path will get caught earlier.
 	if (_segment >= _path.size()) {
-		_path.clear();
 		return false;
 	}
 
@@ -650,7 +657,6 @@ bool WalkingState::walkOnNextEdge() {
 	} else {
 		// Otherwise we are done.  continueWalking() will return false next time.
 		debugC(2, kDraciWalkingDebugLevel, "We have walked the whole path");
-		_path.clear();
 		return false;
 	}
 }
diff --git a/engines/draci/walking.h b/engines/draci/walking.h
index 4c0f31d116b..eb165b2c6f8 100644
--- a/engines/draci/walking.h
+++ b/engines/draci/walking.h
@@ -120,9 +120,11 @@ public:
 
 	// Advances the hero along the path and changes animation accordingly.
 	// Walking MUST be active when calling this method.  When the hero has
-	// arrived to the target, clears the path and returns false, but leaves
-	// the callback untouched (the caller must call it).
+	// arrived to the target, returns false, but leaves the callback
+	// untouched (the caller must call it).
+	// The second variant also clears the path when returning false.
 	bool continueWalking();
+	bool continueWalkingOrClearPath();
 
 	// Called when the hero's turning animation has finished.
 	void heroAnimationFinished();