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

SCUMM: LOOM (Towns): Fix crashes on the menu when no savegames are available

Browse Source
This commit is contained in:
AndywinXp 2022-11-27 21:20:38 +01:00 committed by Eugene Sandulenko
parent 2a91e8ef70
commit 617e7f6077
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/scumm/script_v4.cpp
View File

@ -466,20 +466,30 @@ void ScummEngine_v4::o4_saveLoadGame() {
{
Common::InSaveFile *file = nullptr;
bool availableSaves[100];
bool atLeastOneSaveExists = false;
listSavegames(availableSaves, ARRAYSIZE(availableSaves));
Common::String filename = makeSavegameName(slot, false);
// LOOM Towns explicitly sets the result to 6 if the selected slot is 0
for (int i = 0; i < ARRAYSIZE(availableSaves); i++) {
if (availableSaves[i]) {
atLeastOneSaveExists = true;
break;
}
}
if (availableSaves[slot] && (file = _saveFileMan->openForLoading(filename))) {
result = 6; // Save file exists
delete file;
} else if (_game.id == GID_LOOM && _game.platform == Common::kPlatformFMTowns && slot == 0) {
// LOOM Towns explicitly sets the result to 6 if the selected slot is 0
} else if (_game.id == GID_LOOM && _game.platform == Common::kPlatformFMTowns && slot == 0 && atLeastOneSaveExists) {
// LOOM Towns explicitly sets the result to 6 if the selected slot is 0;
// also, it needs to have at least one savegame available, otherwise it would lead
// to the game reaching towards a non-existent string, and crashing as a consequence.
result = 6;
} else
result = (_game.id == GID_LOOM && _game.platform == Common::kPlatformFMTowns) ? 8 : 7; // Save file does not exist
}
break;
default:
error("o4_saveLoadGame: unknown subopcode %d", _opcode);