From a96f2606539a532848907df1e0d3604ca18573d2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 30 May 2014 20:41:55 -0400
Subject: MADS: Change order of savegame loading to fix scene 318

---
 engines/mads/game.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/mads')

diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 05dd932482..ed97dca746 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -279,10 +279,6 @@ void Game::sectionLoop() {
 		_trigger = 0;
 		_priorFrameTimer = _scene._frameStartTime;
 
-		// Call the scene logic for entering the given scene
-		_triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
-		_scene._sceneLogic->enter();
-
 		// If in the middle of restoring a game, handle the rest of the loading
 		if (_saveFile != nullptr) {
 			Common::Serializer s(_saveFile, nullptr);
@@ -291,6 +287,10 @@ void Game::sectionLoop() {
 			_saveFile = nullptr;
 		}
 
+		// Call the scene logic for entering the given scene
+		_triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
+		_scene._sceneLogic->enter();
+
 		// Set player data
 		_player._targetPos = _player._playerPos;
 		_player._turnToFacing = _player._facing;
-- 
cgit v1.2.3