aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2014-05-30 20:41:55 -0400
committerPaul Gilbert2014-05-30 20:41:55 -0400
commita96f2606539a532848907df1e0d3604ca18573d2 (patch)
treef4fbd3874061a50a15cc2d5bef521724fa61d049
parent59d072c40cd06e28e3b6e13311a9e74043fd72a4 (diff)
downloadscummvm-rg350-a96f2606539a532848907df1e0d3604ca18573d2.tar.gz
scummvm-rg350-a96f2606539a532848907df1e0d3604ca18573d2.tar.bz2
scummvm-rg350-a96f2606539a532848907df1e0d3604ca18573d2.zip
MADS: Change order of savegame loading to fix scene 318
-rw-r--r--engines/mads/game.cpp8
1 files changed, 4 insertions, 4 deletions
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;