libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-01 08:23:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CGE2: Rework loadUser().

Browse Source 
Now initToolbar() works as intended both when starting a new game or when loading an old gamestate.
This commit is contained in:
uruk 2014-07-25 19:19:52 +02:00
parent 72c8dbaf66
commit 3c0665edfa
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/cge2/cge2_main.cpp
View File

@ -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()

4
engines/cge2/saveload.cpp
View File

@ -369,9 +369,7 @@ bool CGE2Engine::loadGame(int slotNumber) {
delete readStream;
syncSpeechSettings();
initToolbar();
loadHeroes();
return true;
}