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

SCUMM: ZAK (FM-Towns): Fix bug #14387

Browse source 
This fixes a crash when loading from the GMM save states which had
been created from the original menu. This also fixes the auto-close of the
menu when a game is loaded from the original menu.
This commit is contained in:
AndywinXp 2023-06-03 12:34:36 +02:00
parent cccac84717
commit fd8cf5dee5
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engines/scumm/saveload.cpp
View file

@ -1858,8 +1858,11 @@ void ScummEngine::saveLoadWithSerializer(Common::Serializer &s) {
for (int v = 102 + 6; v <= 111; v++)
VAR(v) = 0;
// make sure the appropriate verbs and arrows are displayed
runInventoryScript(0);
// Make sure the appropriate verbs and arrows are displayed.
// We avoid doing that in room 50 (save room) since it can crash
// the game and trigger several unwanted side effects (bug #14387).
if (_currentRoom != 50)
runInventoryScript(0);
}
//