From e3b9f84d8179a69be011f7351fb50635f854bf73 Mon Sep 17 00:00:00 2001
From: Marisa-Chan
Date: Fri, 15 Nov 2013 18:15:12 +0000
Subject: ZVISION: Change _currentLocation to new location before execute first
 scripts.

---
 engines/zvision/script_manager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/zvision')

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 861f0e47dc..b121eaa6a7 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -523,11 +523,11 @@ void ScriptManager::do_changeLocation() {
 	// Change the background position
 	_engine->getRenderManager()->setBackgroundPosition(_nextLocation.offset);
 
-	execScope(room);
-	execScope(nodeview);
-
 	// Update _currentLocation
 	_currentLocation = _nextLocation;
+
+	execScope(room);
+	execScope(nodeview);
 }
 
 void ScriptManager::serializeStateTable(Common::WriteStream *stream) {
-- 
cgit v1.2.3