[Scummvm-git-logs] scummvm master -> 8775c6b489e4b15108642162eb45270a55aa89c0

[dwatteau]

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

Summary:
aa0a4949e0 ACCESS: Silence -Wunused-but-set-variable warnings
6fb3002fe7 MM: MM1: Silence -Wunused-but-set-variable warnings
8775c6b489 TWINE: Silence -Wunused-private-field warning


Commit: aa0a4949e00425dc09e90cc57cc93db4e6aa6be8
    https://github.com/scummvm/scummvm/commit/aa0a4949e00425dc09e90cc57cc93db4e6aa6be8
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-06-18T11:33:04+02:00

Commit Message:
ACCESS: Silence -Wunused-but-set-variable warnings

Changed paths:
    engines/access/noctropolis/noctropolis_font.cpp
    engines/access/scripts.cpp


diff --git a/engines/access/noctropolis/noctropolis_font.cpp b/engines/access/noctropolis/noctropolis_font.cpp
index 13a3f805b75..4b9f43e84d6 100644
--- a/engines/access/noctropolis/noctropolis_font.cpp
+++ b/engines/access/noctropolis/noctropolis_font.cpp
@@ -119,6 +119,8 @@ void NoctropolisFont::load(const uint16 *offsets, const byte *data) {
 	pal[3] = pal[4] = pal[5] = 0xff;
 	dumpfile.open(Common::Path(Common::String::format("/tmp/font-%d.png", dumpno++)));
 	Image::writePNG(dumpfile, dump, pal);
+#else
+	(void)totalw;
 #endif
 }
 
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index ceb4f757ef3..9853559cf8f 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -898,13 +898,15 @@ void Scripts::cmdSetVideo_v3() {
 	if (cellIndex > 0x3f)
 		error("Invalid room video number %d", cellIndex);
 
-	bool flag;
 	const int roomNum = _vm->_player->_roomNumber;
+#if 0
+	bool flag;
 
 	if ((roomNum == 0x1e && cellIndex == 0) || roomNum == 0x21 || (roomNum == 0x36 && cellIndex < 32))
 		flag = true;
 	else
 		flag = false;
+#endif
 
 	if (roomNum == 0x1b || roomNum == 0x1e)
 		pt.x = rawx + -5;


Commit: 6fb3002fe74e6562ec0e312cb26cf453e5ce9989
    https://github.com/scummvm/scummvm/commit/6fb3002fe74e6562ec0e312cb26cf453e5ce9989
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-06-18T11:34:49+02:00

Commit Message:
MM: MM1: Silence -Wunused-but-set-variable warnings

Changed paths:
    engines/mm/mm1/metaengine.cpp
    engines/mm/mm1/views_enh/create_characters.cpp


diff --git a/engines/mm/mm1/metaengine.cpp b/engines/mm/mm1/metaengine.cpp
index e8eb06a9982..b16b0399a9b 100644
--- a/engines/mm/mm1/metaengine.cpp
+++ b/engines/mm/mm1/metaengine.cpp
@@ -123,10 +123,12 @@ static const KeybindingRecord NORMAL_KEYS[] = {
 	{ KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
 };
 
+#if 0
 static const KeybindingRecord CHEAT_KEYS[] = {
 	{ KEYBIND_CHEAT_GOTO, "CHEAT-GOTO", _s("Goto location"), "A+g", nullptr },
 	{ KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
 };
+#endif
 
 static const char *const kMenuKeymapId = "mm1_menu";
 static const char *const kMinimalKeymapId = "mm1_minimal";
@@ -154,7 +156,9 @@ static const KeysRecord ALL_RECORDS[] = {
 	{ kNormalKeymapId,  _s("Might and Magic 1 - Main"), NORMAL_KEYS },
 	{ kPartyKeymapId,   _s("Might and Magic 1 - Party"), PARTY_KEYS },
 	{ kCombatKeymapId,  _s("Might and Magic 1 - Combat"), COMBAT_KEYS },
-//	{ kCheatsKeymapId,  _s("Might and Magic 1 - Cheats"), CHEAT_KEYS },
+#if 0
+	{ kCheatsKeymapId,  _s("Might and Magic 1 - Cheats"), CHEAT_KEYS },
+#endif
 	{ nullptr, nullptr, nullptr }
 };
 
diff --git a/engines/mm/mm1/views_enh/create_characters.cpp b/engines/mm/mm1/views_enh/create_characters.cpp
index 27109894929..0620b73a30a 100644
--- a/engines/mm/mm1/views_enh/create_characters.cpp
+++ b/engines/mm/mm1/views_enh/create_characters.cpp
@@ -74,7 +74,6 @@ static void loadSuggestedNames() {
 		return;
 	}
 
-	int invalidLines = 0;
 	while (!f.eos()) {
 		Common::String line = f.readLine();
 		line.trim();
@@ -84,10 +83,8 @@ static void loadSuggestedNames() {
 		size_t p1 = line.findFirstOf('\t');
 		size_t p2 = p1 == Common::String::npos ? Common::String::npos :
 			line.findFirstOf('\t', p1 + 1);
-		if (p1 == Common::String::npos || p2 == Common::String::npos) {
-			++invalidLines;
+		if (p1 == Common::String::npos || p2 == Common::String::npos)
 			continue;
-		}
 
 		int classId = atoi(Common::String(line.c_str(), line.c_str() + p1).c_str());
 		int sexId = atoi(Common::String(line.c_str() + p1 + 1, line.c_str() + p2).c_str());


Commit: 8775c6b489e4b15108642162eb45270a55aa89c0
    https://github.com/scummvm/scummvm/commit/8775c6b489e4b15108642162eb45270a55aa89c0
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-06-18T11:39:40+02:00

Commit Message:
TWINE: Silence -Wunused-private-field warning

Changed paths:
    engines/twine/holomap_v2.cpp


diff --git a/engines/twine/holomap_v2.cpp b/engines/twine/holomap_v2.cpp
index 6c9dc9b6835..80887ea3637 100644
--- a/engines/twine/holomap_v2.cpp
+++ b/engines/twine/holomap_v2.cpp
@@ -342,6 +342,7 @@ void HolomapV2::holoMap() {
 	_flagPal = true;
 	_flagHoloEnd = false;
 	_numObjectif = -1;
+	_oldObjectif = -1;
 
 	_engine->_input->enableKeyMap(holomapKeyMapId);