MADS: Change order of savegame loading to fix scene 318

This commit is contained in:
Paul Gilbert 2014-05-30 20:41:55 -04:00
parent 59d072c40c
commit a96f260653

View File

@ -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;