[Scummvm-git-logs] scummvm master -> 4bf543f6e781da9be37a1498468a4da28f83988d

[digitall]

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:
4bf543f6e7 MM: XEEN: Fix Overloaded Virtuals Shadowing Warnings


Commit: 4bf543f6e781da9be37a1498468a4da28f83988d
    https://github.com/scummvm/scummvm/commit/4bf543f6e781da9be37a1498468a4da28f83988d
Author: D G Turner (digitall at scummvm.org)
Date: 2023-12-03T22:32:07Z

Commit Message:
MM: XEEN: Fix Overloaded Virtuals Shadowing Warnings

These are emitted by GCC-13 if -Woverloaded-virtual is passed.

Changed paths:
    engines/mm/xeen/locations.cpp
    engines/mm/xeen/locations.h
    engines/mm/xeen/scripts.cpp


diff --git a/engines/mm/xeen/locations.cpp b/engines/mm/xeen/locations.cpp
index 2b2295cd640..311ab706587 100644
--- a/engines/mm/xeen/locations.cpp
+++ b/engines/mm/xeen/locations.cpp
@@ -1138,7 +1138,7 @@ int ArenaLocation::show() {
 		for (uint idx = 0; idx < monsters.size(); ++idx) {
 			MazeMonster &monster = monsters[idx];
 			if (monster._position.x != 0x80 && monster._position.y != 0x80) {
-				LocationMessage::show(27, Res.WARZONE_BATTLE_MASTER,
+				LocationMessage::showMessage(27, Res.WARZONE_BATTLE_MASTER,
 					map._events._text[4], 300);
 				goto exit;
 			}
@@ -1154,7 +1154,7 @@ int ArenaLocation::show() {
 		int suffixNum = (count < 10) ? count : 0;
 		Common::String msg = Common::String::format(format.c_str(), count, SUFFIXES[suffixNum]);
 
-		LocationMessage::show(27, Res.WARZONE_BATTLE_MASTER, msg, 1);
+		LocationMessage::showMessage(27, Res.WARZONE_BATTLE_MASTER, msg, 1);
 
 		map.load(28);
 		goto exit;
@@ -1162,15 +1162,15 @@ int ArenaLocation::show() {
 
 	for (uint idx = 0; idx < party._activeParty.size(); ++idx) {
 		if (party._activeParty[idx]._awards[WARZONE_AWARD] >= 99) {
-			LocationMessage::show(27, Res.WARZONE_BATTLE_MASTER, Res.WARZONE_MAXED, 1);
+			LocationMessage::showMessage(27, Res.WARZONE_BATTLE_MASTER, Res.WARZONE_MAXED, 1);
 			map.load(28);
 			goto exit;
 		}
 	}
 
-	check = LocationMessage::show(27, Res.WARZONE_BATTLE_MASTER, map._events._text[0].c_str(), 0);
+	check = LocationMessage::showMessage(27, Res.WARZONE_BATTLE_MASTER, map._events._text[0].c_str(), 0);
 	if (!check) {
-		LocationMessage::show(27, Res.WARZONE_BATTLE_MASTER,
+		LocationMessage::showMessage(27, Res.WARZONE_BATTLE_MASTER,
 			map._events._text[1].c_str(), 300);
 		windows.closeAll();
 		map.load(6);
@@ -1180,20 +1180,20 @@ int ArenaLocation::show() {
 	}
 
 	do {
-		LocationMessage::show(27, Res.WARZONE_BATTLE_MASTER, Res.WARZONE_LEVEL, 2);
+		LocationMessage::showMessage(27, Res.WARZONE_BATTLE_MASTER, Res.WARZONE_LEVEL, 2);
 		level = NumericInput::show(g_vm, 11, 2, 200);
 	} while (!g_vm->shouldExit() && level > 10);
 	if (level == 0)
 		goto exit;
 
 	do {
-		LocationMessage::show(27, Res.WARZONE_BATTLE_MASTER, Res.WARZONE_HOW_MANY, 2);
+		LocationMessage::showMessage(27, Res.WARZONE_BATTLE_MASTER, Res.WARZONE_HOW_MANY, 2);
 		howMany = NumericInput::show(g_vm, 11, 2, 200);
 	} while (!g_vm->shouldExit() && howMany > 20);
 	if (howMany == 0)
 		goto exit;
 
-	LocationMessage::show(27, Res.WARZONE_BATTLE_MASTER, map._events._text[2], 1);
+	LocationMessage::showMessage(27, Res.WARZONE_BATTLE_MASTER, map._events._text[2], 1);
 
 	// Clear monsters array
 	party._mazeDirection = DIR_EAST;
@@ -2346,7 +2346,7 @@ int LocationManager::wait() {
 
 /*------------------------------------------------------------------------*/
 
-bool LocationMessage::show(int portrait, const Common::String &name,
+bool LocationMessage::showMessage(int portrait, const Common::String &name,
 		const Common::String &text, int confirm) {
 	LocationMessage *dlg = new LocationMessage();
 	bool result = dlg->execute(portrait, name, text, confirm);
diff --git a/engines/mm/xeen/locations.h b/engines/mm/xeen/locations.h
index d22a36577f2..8edfbae9702 100644
--- a/engines/mm/xeen/locations.h
+++ b/engines/mm/xeen/locations.h
@@ -374,7 +374,7 @@ private:
 
 	void loadButtons();
 public:
-	static bool show(int portrait, const Common::String &name,
+	static bool showMessage(int portrait, const Common::String &name,
 		const Common::String &text, int confirm);
 };
 
diff --git a/engines/mm/xeen/scripts.cpp b/engines/mm/xeen/scripts.cpp
index cac59f9959f..37608456c32 100644
--- a/engines/mm/xeen/scripts.cpp
+++ b/engines/mm/xeen/scripts.cpp
@@ -456,7 +456,7 @@ bool Scripts::cmdNPC(ParamsIterator &params) {
 	int confirm = params.readByte();
 	int lineNum = params.readByte();
 
-	if (LocationMessage::show(portrait, _message, map._events._text[textNum],
+	if (LocationMessage::showMessage(portrait, _message, map._events._text[textNum],
 			confirm)) {
 		_lineNum = lineNum;
 		return false;