thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASYLUM: add support for loading during startup

Browse source
This commit is contained in:
alxpnv 2021-09-20 12:03:40 +03:00
parent 0fbe223f8a
commit 377ffb92be
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
engines/asylum/asylum.cpp
View file

@ -145,7 +145,18 @@ Common::Error AsylumEngine::run() {
_video->play(0, NULL);
restart();
} else {
_handler = _menu;
int saveSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
bool noError = false;
if (saveSlot >= 0 && saveSlot < SAVEGAME_COUNT) {
if (loadGameState(saveSlot).getCode() != Common::kNoError)
warning("[AsylumEngine::run] Could not load savegame in slot %d", saveSlot);
else
noError = true;
}
if (!noError)
_handler = _menu;
// Load config
Config.read();
@ -655,7 +666,10 @@ bool AsylumEngine::canSaveGameStateCurrently() {
Common::Error AsylumEngine::loadGameState(int slot) {
savegame()->loadList();
savegame()->setIndex(slot);
startGame(savegame()->getScenePack(), AsylumEngine::kStartGameLoad);
if (savegame()->hasSavegame(slot))
startGame(savegame()->getScenePack(), AsylumEngine::kStartGameLoad);
else
return Common::kReadingFailed;
return Common::kNoError;
}