diff options
Diffstat (limited to 'engines/cge2')
-rw-r--r-- | engines/cge2/cge2_main.cpp | 10 | ||||
-rw-r--r-- | engines/cge2/saveload.cpp | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp index e4b34a001c..87ab2dea8f 100644 --- a/engines/cge2/cge2_main.cpp +++ b/engines/cge2/cge2_main.cpp @@ -643,9 +643,8 @@ void CGE2Engine::runGame() { loadUser(); - initToolbar(); - sceneUp(_now); + initToolbar(); // main loop while (!_endGame && !_quitFlag) { @@ -666,12 +665,13 @@ void CGE2Engine::runGame() { void CGE2Engine::loadUser() { loadPos(); + if (_startGameSlot != -1) loadGame(_startGameSlot); - else { + else loadScript("CGE.INI"); - loadHeroes(); - } + + loadHeroes(); } void CGE2Engine::loadHeroes() { // Original name: loadGame() diff --git a/engines/cge2/saveload.cpp b/engines/cge2/saveload.cpp index 3c57e621f2..5e60f07bcd 100644 --- a/engines/cge2/saveload.cpp +++ b/engines/cge2/saveload.cpp @@ -369,9 +369,7 @@ bool CGE2Engine::loadGame(int slotNumber) { delete readStream; syncSpeechSettings(); - initToolbar(); - loadHeroes(); - + return true; } |