[Scummvm-git-logs] scummvm branch-2-9 -> 720393a6f698e499a4e0ef22f378dea207437810

[eriktorbjorn]

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:
720393a6f6 SCUMM: MACGUI: Never fail to initialize the Mac GUI for Loom/Indy3


Commit: 720393a6f698e499a4e0ef22f378dea207437810
    https://github.com/scummvm/scummvm/commit/720393a6f698e499a4e0ef22f378dea207437810
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-11-18T06:55:00+01:00

Commit Message:
SCUMM: MACGUI: Never fail to initialize the Mac GUI for Loom/Indy3

These games need the Mac GUI for more than just the menus and dialogs,
so for now if the initialization fails (i.e. the STRS resource was not
recognized, and could not be loaded) just disable the original GUI and
keep going.

Changed paths:
    engines/scumm/macgui/macgui_impl.cpp


diff --git a/engines/scumm/macgui/macgui_impl.cpp b/engines/scumm/macgui/macgui_impl.cpp
index b15fcfa909f..6cf3298ebc6 100644
--- a/engines/scumm/macgui/macgui_impl.cpp
+++ b/engines/scumm/macgui/macgui_impl.cpp
@@ -164,8 +164,17 @@ void MacGuiImpl::menuCallback(int id, Common::String &name, void *data) {
 }
 
 bool MacGuiImpl::initialize() {
-	if (!readStrings())
-		return false;
+	if (!readStrings()) {
+		// FIXME: THIS IS A TEMPORARY WORKAROUND
+		// The Mac GUI initialization must never fail for Loom or Last Crusade,
+		// because it's used for more than just the Mac menus and dialogs. So
+		// for those games we just silently disable the original GUI, and let
+		// the game start anyway.
+		if (_vm->_game.id == GID_LOOM || _vm->_game.id == GID_INDY3)
+			_vm->_useOriginalGUI = false;
+		else
+			return false;
+	}
 
 	uint32 menuMode = Graphics::kWMModeNoDesktop | Graphics::kWMModeAutohideMenu |
 		Graphics::kWMModalMenuMode | Graphics::kWMModeNoCursorOverride | Graphics::kWMModeForceMacFonts;