aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichieSams2013-09-21 00:03:49 -0500
committerRichieSams2013-09-21 00:03:49 -0500
commit8557b06197bde4574be34810bcf59c3530acc326 (patch)
treeaf4f8796ff96ab05a45d35f11508464df7205c09
parentd06c64d0762eb5f4b3f32c5402d05e801bb80ed8 (diff)
downloadscummvm-rg350-8557b06197bde4574be34810bcf59c3530acc326.tar.gz
scummvm-rg350-8557b06197bde4574be34810bcf59c3530acc326.tar.bz2
scummvm-rg350-8557b06197bde4574be34810bcf59c3530acc326.zip
ZVISION: Load the state values before changing location
-rw-r--r--engines/zvision/save_manager.cpp6
1 files changed, 3 insertions, 3 deletions
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);