[Scummvm-git-logs] scummvm master -> 1970f820ce8d30d3ae04b7882a2853984025b3d1

[AndywinXp]

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

Summary:
1970f820ce BOLT: Fix remaining warnings


Commit: 1970f820ce8d30d3ae04b7882a2853984025b3d1
    https://github.com/scummvm/scummvm/commit/1970f820ce8d30d3ae04b7882a2853984025b3d1
Author: AndywinXp (andywinxp at gmail.com)
Date: 2026-04-07T14:10:25+02:00

Commit Message:
BOLT: Fix remaining warnings

Changed paths:
    engines/bolt/booths/huck.cpp
    engines/bolt/booths/topcat.cpp
    engines/bolt/xplib/events.cpp
    engines/bolt/xplib/xplib.h


diff --git a/engines/bolt/booths/huck.cpp b/engines/bolt/booths/huck.cpp
index 28c6ab4649a..4c94e0f5bb1 100644
--- a/engines/bolt/booths/huck.cpp
+++ b/engines/bolt/booths/huck.cpp
@@ -638,7 +638,7 @@ void BoltEngine::giftSwap() {
 	int16 slotA = -1;
 	int16 slotB = 0;
 	int16 counter = -1;
-	for (int16 i = 0, j = 0; j < READ_UINT16(_huckGiftPic); i++, j++) {
+	for (int16 j = 0; j < READ_UINT16(_huckGiftPic); j++) {
 		if (_huckState.drawTable2[j] != 0)
 			continue;
 
diff --git a/engines/bolt/booths/topcat.cpp b/engines/bolt/booths/topcat.cpp
index d83e4bd707c..5690af46d6d 100644
--- a/engines/bolt/booths/topcat.cpp
+++ b/engines/bolt/booths/topcat.cpp
@@ -334,7 +334,6 @@ int16 BoltEngine::playTopCat() {
 			cursorX = (int16)(eventData & 0xFFFF);
 
 			// Hit-test against buttons...
-			int16 entryIdx = 0;
 			byte *entry = nullptr;
 			int16 off = 0;
 
@@ -355,7 +354,6 @@ int16 BoltEngine::playTopCat() {
 					break;
 
 				off += 4;
-				entryIdx++;
 			}
 
 			// Unhighlight previous entry if needed...
diff --git a/engines/bolt/xplib/events.cpp b/engines/bolt/xplib/events.cpp
index eae1ee3562b..942211c04ff 100644
--- a/engines/bolt/xplib/events.cpp
+++ b/engines/bolt/xplib/events.cpp
@@ -167,7 +167,7 @@ void XpLib::pumpMessages() {
 	// Process all pending events...
 	while (_bolt->_eventMan->pollEvent(event) && !_bolt->shouldQuit()) {
 		switch (event.type) {
-		case Bolt::CustomEventType::EVENT_TIMER:
+		case Bolt::EVENT_TIMER:
 			handleTimer(event.customType);
 			break;
 
diff --git a/engines/bolt/xplib/xplib.h b/engines/bolt/xplib/xplib.h
index ac42467a819..3e95f2ae2eb 100644
--- a/engines/bolt/xplib/xplib.h
+++ b/engines/bolt/xplib/xplib.h
@@ -120,9 +120,7 @@ enum XPEventKeyStates : int16 {
 	eksJoystickMode = 2
 };
 
-enum CustomEventType {
-	EVENT_TIMER = Common::EVENT_USER_FIRST_AVAILABLE
-};
+static const Common::EventType EVENT_TIMER = Common::EVENT_USER_FIRST_AVAILABLE;
 
 typedef struct XPEvent {
 	XPEvent *prev;