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

[sev-]

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

Summary:
830d9ab9af WAGE: Added loading debug channel and print menu loading log
e63fb18824 WAGE: Add About menu items even in case it has no action


Commit: 830d9ab9af4b091dba4db6f574190ee022286d74
    https://github.com/scummvm/scummvm/commit/830d9ab9af4b091dba4db6f574190ee022286d74
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-31T14:02:14+01:00

Commit Message:
WAGE: Added loading debug channel and print menu loading log

Changed paths:
    engines/wage/detection.cpp
    engines/wage/wage.h
    engines/wage/world.cpp


diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp
index 05e6712cc66..bb6b4bc3852 100644
--- a/engines/wage/detection.cpp
+++ b/engines/wage/detection.cpp
@@ -45,8 +45,9 @@ static const PlainGameDescriptor wageGames[] = {
 #include "wage/detection.h"
 
 static const DebugChannelDef debugFlagList[] = {
-	{Wage::kDebugImGui, "imgui", "Show ImGui debug window (if available)"},
-	{Wage::kDebugSound, "sound", "Show sound debug information	"},
+	{ Wage::kDebugImGui,   "imgui",   "Show ImGui debug window (if available)"},
+	{ Wage::kDebugSound,   "sound",   "Show sound debug information"},
+	{ Wage::kDebugLoading, "loading", "Show loading debug information" },
 	DEBUG_CHANNEL_END
 };
 
diff --git a/engines/wage/wage.h b/engines/wage/wage.h
index 20364f3988e..a30e55cb62e 100644
--- a/engines/wage/wage.h
+++ b/engines/wage/wage.h
@@ -94,6 +94,7 @@ typedef Common::List<Chr *> ChrList;
 enum {
 	kDebugImGui = 1,
 	kDebugSound,
+	kDebugLoading,
 };
 
 enum OperandType {
diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp
index 5dd15ace041..cef68978418 100644
--- a/engines/wage/world.cpp
+++ b/engines/wage/world.cpp
@@ -357,6 +357,8 @@ bool World::loadWorld(Common::MacResManager *resMan) {
 		for (uint i = 0; i < string.size() && string[i] != ';'; i++) // Read token
 			_aboutMenuItemName += string[i];
 
+		debugC(1, kDebugLoading, "MENU: About: %s", toPrintable(_aboutMenuItemName).c_str());
+
 		delete menu;
 		delete res;
 	}
@@ -365,6 +367,10 @@ bool World::loadWorld(Common::MacResManager *resMan) {
 		Common::StringArray *menu = Graphics::MacMenu::readMenuFromResource(res);
 		_commandsMenuName = menu->operator[](0);
 		_commandsMenu = menu->operator[](1);
+
+		debugC(1, kDebugLoading, "MENU: Commands name: %s", toPrintable(_commandsMenuName).c_str());
+		debugC(1, kDebugLoading, "MENU: Commands menu: %s", toPrintable(_commandsMenu).c_str());
+
 		delete menu;
 		delete res;
 	}
@@ -374,6 +380,8 @@ bool World::loadWorld(Common::MacResManager *resMan) {
 		_weaponsMenuName = menu->operator[](0);
 		delete menu;
 		delete res;
+
+		debugC(1, kDebugLoading, "MENU: Weapons name: %s", toPrintable(_weaponsMenuName).c_str());
 	}
 	// TODO: Read Apple menu and get the name of that menu item..
 
@@ -553,6 +561,8 @@ const char *World::getAboutMenuItemName() {
 		}
 	}
 
+	debugC(1, kDebugLoading, "MENU: About cleansed: %s", Common::toPrintable(menu).c_str());
+
 	return menu;
 }
 


Commit: e63fb1882499c9c9086f7404666cbf4b811c85c9
    https://github.com/scummvm/scummvm/commit/e63fb1882499c9c9086f7404666cbf4b811c85c9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-31T14:02:37+01:00

Commit Message:
WAGE: Add About menu items even in case it has no action

Fixes bug #16235: "WAGE: The Village is missing its "About" menu item"

Changed paths:
    engines/wage/world.cpp


diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp
index cef68978418..6dbf8cd1889 100644
--- a/engines/wage/world.cpp
+++ b/engines/wage/world.cpp
@@ -558,6 +558,8 @@ const char *World::getAboutMenuItemName() {
 			strncat(menu, str, (pos - str));
 			strncat(menu, _name.c_str(), 255);
 			strncat(menu, pos + 1, 255);
+		} else {
+			Common::strlcpy(menu, _aboutMenuItemName.c_str(), 256);
 		}
 	}