SCUMM: MACGUI: Fix game name in v6-v7 Apple menu

scummvm · bluegr · Jan 1, 2025 · Dec 10, 2024 · Dec 11, 2024 · Dec 11, 2024
commit d026f73869a17016be342b87f5f15f78fe10cc5c
diff --git a/engines/scumm/macgui/macgui_impl.h b/engines/scumm/macgui/macgui_impl.h
@@ -238,7 +238,7 @@ class MacGuiImpl {
 
 	bool runOkCancelDialog(Common::String text);
 
-	bool readStrings();
+	virtual bool readStrings();
 	void parseSTRSBlock(uint8 *strsData, const MacSTRSParsingEntry *parsingTable, int parsingTableSize);
 
 	// These are non interactable, no point in having them as widgets for now...

diff --git a/engines/scumm/macgui/macgui_strings.cpp b/engines/scumm/macgui/macgui_strings.cpp
@@ -603,14 +603,12 @@ static const MacGuiImpl::MacSTRSParsingEntry strsIndy4FloppyVariant2Table[] = {
 #undef SKIP_P
 
 bool MacGuiImpl::readStrings() {
-	if (_vm->_game.version >= 6) {
-		// TODO: Fix this!
+	if (_vm->_game.version >= 6 || _vm->_game.id == GID_MANIAC) {
 		_strsStrings.clear();
 		_strsStrings.reserve(128);
 		for (int i = 0; i < 128; i++) {
 			_strsStrings.emplace_back("");
 		}
-		_strsStrings[kMSIAboutGameName] = "About some game...";
 		return true;
 	}
 

diff --git a/engines/scumm/macgui/macgui_v6.cpp b/engines/scumm/macgui/macgui_v6.cpp
@@ -57,6 +57,19 @@ namespace Scumm {
 MacV6Gui::MacV6Gui(ScummEngine *vm, const Common::Path &resourceFile) : MacGuiImpl(vm, resourceFile) {
 	_backupScreen = nullptr;
 	_backupPalette = nullptr;
+
+	if (_vm->_game.id == GID_TENTACLE)
+		_gameName = "Day of the Tentacle";
+	else if (_vm->_game.id == GID_SAMNMAX)
+		_gameName = "Sam & Max";
+	else if (_vm->_game.id == GID_DIG)
+		_gameName = "The Dig";
+	else if (_vm->_game.id == GID_FT)
+		_gameName = "Full Throttle";
+	else if (_vm->_game.id == GID_MANIAC)
+		_gameName = "Maniac Mansion";
+	else
+		_gameName = "Some Game I Do Not Know";
 }
 
 MacV6Gui::~MacV6Gui() {
@@ -68,8 +81,18 @@ MacV6Gui::~MacV6Gui() {
 	delete _backupPalette;
 }
 
+bool MacV6Gui::readStrings() {
+	_strsStrings.clear();
+	_strsStrings.reserve(128);
+	for (int i = 0; i < 128; i++)
+		_strsStrings.emplace_back("");
+
+	_strsStrings[kMSIAboutGameName] = "About " + _gameName + "...";
+	return true;
+}
+
 const Graphics::Font *MacV6Gui::getFontByScummId(int32 id) {
-	// V5 games do not use CharsetRendererMac
+	// V6 and V7 games (and Maniac Mansion) do not use CharsetRendererMac
 	return nullptr;
 }
 
@@ -408,11 +431,14 @@ bool MacV6Gui::runRestartDialog() {
 
 	window->setDefaultWidget(buttonOk);
 
-	// Only Day of the Tentacle seems to have a Restart dialog?
 	window->addSubstitution("");
 	window->addSubstitution("");
 	window->addSubstitution("");
-	window->addSubstitution("Day of the Tentacle");
+
+	if (_vm->_game.id == GID_TENTACLE)
+		window->addSubstitution("Day of the Tentacle");
+	else
+		window->addSubstitution("Sam & Max");
 
 	Common::Array<int> deferredActionsIds;
 

diff --git a/engines/scumm/macgui/macgui_v6.h b/engines/scumm/macgui/macgui_v6.h
@@ -32,6 +32,8 @@ class MacGuiImpl;
 
 class MacV6Gui : public MacGuiImpl {
 private:
+	Common::String _gameName;
+
 	Graphics::Surface *_backupScreen;
 	byte *_backupPalette;
 
@@ -41,6 +43,8 @@ class MacV6Gui : public MacGuiImpl {
 	MacV6Gui(ScummEngine *vm, const Common::Path &resourceFile);
 	~MacV6Gui();
 
+	bool readStrings() override;
+
 	uint32 getBlack() const override;
 	uint32 getWhite() const override;