[Scummvm-git-logs] scummvm master -> 90c7b813c61e7c4c956fc6e5ff002b3bac79aa89

[athrxx]

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

Summary:
90c7b813c6 SCUMM: fix bug no. 16111


Commit: 90c7b813c61e7c4c956fc6e5ff002b3bac79aa89
    https://github.com/scummvm/scummvm/commit/90c7b813c61e7c4c956fc6e5ff002b3bac79aa89
Author: athrxx (athrxx at scummvm.org)
Date: 2025-07-19T22:46:16+02:00

Commit Message:
SCUMM: fix bug no. 16111

The bug happens in the original interpreter, too. I made
a workaround for it.

Changed paths:
    engines/scumm/room.cpp


diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp
index ecb1c70a899..65fc6cf927e 100644
--- a/engines/scumm/room.cpp
+++ b/engines/scumm/room.cpp
@@ -227,6 +227,14 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) {
 		}
 	}
 
+	// WORKAROUND for bug #16111
+	// Due to a faulty box flag, ZAK FM-TOWNS will freeze when trying to load a game saved in
+	// room 138, but also when pressing F5 while in that room and then clicking the PLAY button
+	// in the save menu. The latter case is the reason why I put the workaround in here, and
+	// not just in ScummEngine_v3::scummLoop_handleSaveLoad() where it would be less visible.
+	if (_game.id == GID_ZAK && _game.platform == Common::kPlatformFMTowns && a == nullptr && room == 138)
+		setBoxFlags(4, 0);
+
 	showActors();
 
 	_egoPositioned = false;
@@ -234,7 +242,6 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) {
 #ifndef DISABLE_TOWNS_DUAL_LAYER_MODE
 	towns_resetPalCycleFields();
 #endif
-
 	runEntryScript();
 	if (_game.version >= 1 && _game.version <= 2) {
 		runScript(5, 0, 0, nullptr);