[Scummvm-git-logs] scummvm master -> 5626994c141522910ee5d48c4064cb184f8f13b1

[AndywinXp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

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


Commit: 5626994c141522910ee5d48c4064cb184f8f13b1
    https://github.com/scummvm/scummvm/commit/5626994c141522910ee5d48c4064cb184f8f13b1
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-06-03T12:34:36+02:00

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

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.

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index b87107cab79..f261533fb91 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -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);
 	}
 
 	//