[Scummvm-git-logs] scummvm branch-2-8 -> f42f5e0f4cfe30d67ee2b3865412947ec2f379de

[eriktorbjorn]

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

Summary:
4014ecdd3c SCUMM: Fix enabling/disabling of open/save in Mac Indy 3
f42f5e0f4c NEWS: Mention Mac Indy 3 Open/Save fix


Commit: 4014ecdd3c6c53a6c1df5497fac2d4ad8296b410
    https://github.com/scummvm/scummvm/commit/4014ecdd3c6c53a6c1df5497fac2d4ad8296b410
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2023-12-22T13:08:36+01:00

Commit Message:
SCUMM: Fix enabling/disabling of open/save in Mac Indy 3

It was disabling open instead of save, and vice versa. It did not affect
Loom, since there it's the same condition for either. Again, please
don't merge to master. I'll fix it on my Mac GUI branch.

Changed paths:
    engines/scumm/gfx_mac.cpp


diff --git a/engines/scumm/gfx_mac.cpp b/engines/scumm/gfx_mac.cpp
index 52fb29e2778..68df5c0332a 100644
--- a/engines/scumm/gfx_mac.cpp
+++ b/engines/scumm/gfx_mac.cpp
@@ -2781,8 +2781,8 @@ void MacGui::updateWindowManager() {
 			(_vm->_userPut > 0);
 	}
 
-	bool canLoad = _vm->canLoadGameStateCurrently() && saveCondition;
-	bool canSave = _vm->canSaveGameStateCurrently() && loadCondition;
+	bool canLoad = _vm->canLoadGameStateCurrently() && loadCondition;
+	bool canSave = _vm->canSaveGameStateCurrently() && saveCondition;
 
 	Graphics::MacMenuItem *gameMenu = menu->getMenuItem("Game");
 	Graphics::MacMenuItem *loadMenu = menu->getSubMenuItem(gameMenu, 0);


Commit: f42f5e0f4cfe30d67ee2b3865412947ec2f379de
    https://github.com/scummvm/scummvm/commit/f42f5e0f4cfe30d67ee2b3865412947ec2f379de
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2023-12-22T13:11:22+01:00

Commit Message:
NEWS: Mention Mac Indy 3 Open/Save fix

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index b8a4e8961ee..b0a165a021c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -6,6 +6,8 @@ For a more comprehensive changelog of the latest experimental code, see:
  SCUMM:
    - Fix screen corruption (and sometimes even crashes) in Mac Loom and
      Indiana Jones and the Last Crusade when using menu shortcut keys.
+   - Fix enabling/disabling of Open and Save in Mac Indiana Jones and the Last
+     Crusade.
 
 #### 2.8.0 (2023-12-30)