Merge remote branch 'upstream/master' into t7g-ios

Conflicts:
	video/qt_decoder.cpp

1 files changed, 6 insertions, 5 deletions

diff --git a/engines/kyra/scene_v2.cpp b/engines/kyra/scene_v2.cpp
index f0c26acd54..fdfbceb521 100644
--- a/engines/kyra/scene_v2.cpp
+++ b/engines/kyra/scene_v2.cpp
@@ -86,15 +86,16 @@ int KyraEngine_v2::findWay(int x, int y, int toX, int toY, int *moveTable, int m
 	x &= ~3; toX &= ~3;
 	y &= ~1; toY &= ~1;
 	int size = KyraEngine_v1::findWay(x, y, toX, toY, moveTable, moveTableSize);
-	static bool usePostProcess = false;
-	if (size && !usePostProcess) {
-		usePostProcess = true;
+
+	if (size && !_smoothingPath) {
+		_smoothingPath = true;
 		int temp = pathfinderInitPositionTable(moveTable);
 		temp = pathfinderInitPositionIndexTable(temp, x, y);
 		pathfinderFinializePath(moveTable, temp, x, y, moveTableSize);
-		usePostProcess = false;
+		_smoothingPath = false;
 	}
-	return usePostProcess ? size : getMoveTableSize(moveTable);
+
+	return _smoothingPath ? size : getMoveTableSize(moveTable);
 }
 
 bool KyraEngine_v2::directLinePassable(int x, int y, int toX, int toY) {