From 8557b06197bde4574be34810bcf59c3530acc326 Mon Sep 17 00:00:00 2001
From: RichieSams
Date: Sat, 21 Sep 2013 00:03:49 -0500
Subject: ZVISION: Load the state values before changing location

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

(limited to 'engines/zvision')

diff --git a/engines/zvision/save_manager.cpp b/engines/zvision/save_manager.cpp
index e09d31557a..70de9050e8 100644
--- a/engines/zvision/save_manager.cpp
+++ b/engines/zvision/save_manager.cpp
@@ -144,12 +144,12 @@ Common::Error SaveManager::loadGame(uint slot) {
 	uint32 offset = (char)saveFile->readUint32LE();
 
 	ScriptManager *scriptManager = _engine->getScriptManager();
-	// Load the room
-	scriptManager->changeLocation(world, room, node, view, offset);
-
 	// Update the state table values
 	scriptManager->deserializeStateTable(saveFile);
 
+	// Load the room
+	scriptManager->changeLocation(world, room, node, view, offset);
+
 	// Update the controls
 	scriptManager->deserializeControls(saveFile);
 
-- 
cgit v1.2.3