[Scummvm-git-logs] scummvm master -> c4c1d64d9fe62f4c06b265803e053eb8bc652451

[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:
2d6e00bc37 SCUMM: MACGUI: Add support for Day of the Tentacle demo
c4c1d64d9f GRAPHICS: MACGUI: Allow menus to grow a bit wider


Commit: 2d6e00bc37cde0d0dd7bd0e8df1aef3ff4c11337
    https://github.com/scummvm/scummvm/commit/2d6e00bc37cde0d0dd7bd0e8df1aef3ff4c11337
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-01-02T18:00:50+01:00

Commit Message:
SCUMM: MACGUI: Add support for Day of the Tentacle demo

It's non-interactive, like the DOS version, but still has menus and an
About dialog.

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


diff --git a/engines/scumm/macgui/macgui_v6.cpp b/engines/scumm/macgui/macgui_v6.cpp
index ec18eb71d8e..37a3ae1a2f4 100644
--- a/engines/scumm/macgui/macgui_v6.cpp
+++ b/engines/scumm/macgui/macgui_v6.cpp
@@ -405,7 +405,7 @@ void MacV6Gui::runAboutDialog() {
 		// It would be nice if we could figure these out automatically
 		Common::Rect bounds(117, 5, 523, 384);
 
-		if (_vm->_game.id == GID_SAMNMAX) {
+		if (_vm->_game.id == GID_TENTACLE || _vm->_game.id == GID_SAMNMAX) {
 			bounds.left = 117;
 			bounds.top = 5;
 			bounds.right = 523;
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 441fa526f55..4461ac98dc5 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1234,33 +1234,34 @@ Common::Error ScummEngine::init() {
 		// characters like that.
 
 		MacFileName macFileNames[] = {
-			{ GID_MANIAC,   "Day of the Tentacle",   },
-			{ GID_INDY3,    "Indy\xAA"               },
-			{ GID_INDY3,    "Indy\x99"               },
-			{ GID_INDY3,    "Indy\xE2\x84\xA2"       },
-			{ GID_INDY3,    "Indy"                   },
-			{ GID_LOOM,     "Loom\xAA"               },
-			{ GID_LOOM,     "Loom\x99"               },
-			{ GID_LOOM,     "Loom\xE2\x84\xA2"       },
-			{ GID_LOOM,     "Loom"                   },
-			{ GID_MONKEY,   "Monkey Island"          },
-			{ GID_INDY4,    "Fate of Atlantis"       },
-			{ GID_INDY4,    "Fate of Atlantis 1.1"   },
-			{ GID_INDY4,    "Indy Fate"              },
-			{ GID_INDY4,    "fate v1.5"              },
-			{ GID_INDY4,    "Indy 12/15/92"          },
-			{ GID_INDY4,    "Indy 12-15-92"          },
-			{ GID_INDY4,    "Fate of Atlantis v1.5"  },
-			{ GID_INDY4,    "Fate of Atlantis v.1.5" },
-			{ GID_INDY4,    "Indy Demo"              },
-			{ GID_MONKEY2,  "LeChuck's Revenge"      },
-			{ GID_TENTACLE, "Day of the Tentacle"    },
-			{ GID_SAMNMAX,  "Sam & Max"              },
-			{ GID_SAMNMAX,  "Sam & Max Demo"         },
-			{ GID_DIG,      "The Dig"                },
-			{ GID_DIG,      "The Dig Demo"           },
-			{ GID_FT,       "Full Throttle"          },
-			{ GID_FT,       "Full Throttle Demo"     }
+			{ GID_MANIAC,   "Day of the Tentacle",     },
+			{ GID_INDY3,    "Indy\xAA"                 },
+			{ GID_INDY3,    "Indy\x99"                 },
+			{ GID_INDY3,    "Indy\xE2\x84\xA2"         },
+			{ GID_INDY3,    "Indy"                     },
+			{ GID_LOOM,     "Loom\xAA"                 },
+			{ GID_LOOM,     "Loom\x99"                 },
+			{ GID_LOOM,     "Loom\xE2\x84\xA2"         },
+			{ GID_LOOM,     "Loom"                     },
+			{ GID_MONKEY,   "Monkey Island"            },
+			{ GID_INDY4,    "Fate of Atlantis"         },
+			{ GID_INDY4,    "Fate of Atlantis 1.1"     },
+			{ GID_INDY4,    "Indy Fate"                },
+			{ GID_INDY4,    "fate v1.5"                },
+			{ GID_INDY4,    "Indy 12/15/92"            },
+			{ GID_INDY4,    "Indy 12-15-92"            },
+			{ GID_INDY4,    "Fate of Atlantis v1.5"    },
+			{ GID_INDY4,    "Fate of Atlantis v.1.5"   },
+			{ GID_INDY4,    "Indy Demo"                },
+			{ GID_MONKEY2,  "LeChuck's Revenge"        },
+			{ GID_TENTACLE, "Day of the Tentacle"      },
+			{ GID_TENTACLE, "Day of the Tentacle Demo" },
+			{ GID_SAMNMAX,  "Sam & Max"                },
+			{ GID_SAMNMAX,  "Sam & Max Demo"           },
+			{ GID_DIG,      "The Dig"                  },
+			{ GID_DIG,      "The Dig Demo"             },
+			{ GID_FT,       "Full Throttle"            },
+			{ GID_FT,       "Full Throttle Demo"       }
 		};
 
 		bool macScumm = false;


Commit: c4c1d64d9fe62f4c06b265803e053eb8bc652451
    https://github.com/scummvm/scummvm/commit/c4c1d64d9fe62f4c06b265803e053eb8bc652451
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-01-02T18:00:50+01:00

Commit Message:
GRAPHICS: MACGUI: Allow menus to grow a bit wider

It's needed to avoid the Apple menu in the Day of the Tentacle Demo from
becoming truncated.

Changed paths:
    graphics/macgui/macmenu.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 0d6d6c28cdd..f1a2dc38995 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -933,7 +933,7 @@ int MacMenu::calcSubMenuWidth(MacMenuSubMenu *submenu) {
 			}
 		}
 	}
-	return maxWidth > 200 ? 200 : maxWidth;
+	return maxWidth > 225 ? 225 : maxWidth;
 }
 
 void MacMenu::calcSubMenuBounds(MacMenuSubMenu *submenu, int x, int y) {