From 0962f332cb42afaf9d83bc0b3a7434f255c83835 Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Sat, 19 Feb 2011 12:11:09 +0100
Subject: TUCKER: fix #2872348 - walk bug by switching places in museum

Looks like an original game glitch, prevent hard-coded sequence
execution on location switch (after using map).
---
 engines/tucker/locations.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index 416f2ba36e..cd99656695 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -2483,7 +2483,8 @@ void TuckerEngine::updateSprite_locationNum58(int i) {
 }
 
 void TuckerEngine::execData3PreUpdate_locationNum58() {
-	if (_flagsTable[190] < 3 && _xPosCurrent > 310) {
+	// workaround original game glitch #2872348: do not change position on location change
+	if (_nextLocationNum == 0 && _flagsTable[190] < 3 && _xPosCurrent > 310) {
 		_xPosCurrent = 310;
 		_panelLockedFlag = 0;
 	}
-- 
cgit v1.2.3