aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2014-02-17 03:29:17 +0200
committerFilippos Karapetis2014-02-17 03:29:54 +0200
commit5b1631960e1c10e8fe60261eee0cec62756e3d66 (patch)
tree1f714373918fdaad063bb1e16bce4e5ee5061370
parenta5f0cd06e648765791828b8f2dc90880621182f2 (diff)
downloadscummvm-rg350-5b1631960e1c10e8fe60261eee0cec62756e3d66.tar.gz
scummvm-rg350-5b1631960e1c10e8fe60261eee0cec62756e3d66.tar.bz2
scummvm-rg350-5b1631960e1c10e8fe60261eee0cec62756e3d66.zip
SCI: Fix bug #6536 - "SCI: JONES - top menu empty after loading from launcher"
-rw-r--r--engines/sci/sci.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index f32e0e16f9..fdc016b1b9 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -286,6 +286,11 @@ Common::Error SciEngine::run() {
// We set this, so that the game automatically quit right after init
_gamestate->variables[VAR_GLOBAL][4] = TRUE_REG;
+ // Jones only initializes its menus when restarting/restoring, thus set
+ // the gameIsRestarting flag here before initializing. Fixes bug #6536.
+ if (g_sci->getGameId() == GID_JONES)
+ _gamestate->gameIsRestarting = GAMEISRESTARTING_RESTORE;
+
_gamestate->_executionStackPosChanged = false;
run_vm(_gamestate);