diff options
author | uruk | 2014-07-28 20:40:42 +0200 |
---|---|---|
committer | uruk | 2014-07-28 20:40:42 +0200 |
commit | db6cab7a6f92855b2264f1899011346dc2e1b91d (patch) | |
tree | 95aa521e17ae97fbab6ad351f26294dcb3164667 | |
parent | b911b66cc4ea2db2dcf869e1eba01f8aa7007ec6 (diff) | |
download | scummvm-rg350-db6cab7a6f92855b2264f1899011346dc2e1b91d.tar.gz scummvm-rg350-db6cab7a6f92855b2264f1899011346dc2e1b91d.tar.bz2 scummvm-rg350-db6cab7a6f92855b2264f1899011346dc2e1b91d.zip |
CGE2: Repair loading from savestate.
-rw-r--r-- | engines/cge2/cge2_main.cpp | 6 | ||||
-rw-r--r-- | engines/cge2/saveload.cpp | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp index 65f856d815..2669ac9fe7 100644 --- a/engines/cge2/cge2_main.cpp +++ b/engines/cge2/cge2_main.cpp @@ -669,10 +669,10 @@ void CGE2Engine::loadUser() { 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 5e60f07bcd..c468f65855 100644 --- a/engines/cge2/saveload.cpp +++ b/engines/cge2/saveload.cpp @@ -369,6 +369,9 @@ bool CGE2Engine::loadGame(int slotNumber) { delete readStream; syncSpeechSettings(); + + loadHeroes(); + initToolbar(); return true; } |