[Scummvm-git-logs] scummvm master -> 222ba6fb7cf4f0086b75ba4caa46dcf7812e37c2
bluegr
noreply at scummvm.org
Wed Jul 15 20:18:42 UTC 2026
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:
55f93ab9f0 FOOL: Fix signed/unsigned warnings
222ba6fb7c MACGUI: Fix signed/unsigned warnings
Commit: 55f93ab9f03f5a24fbb195356dcc5bda4b78c982
https://github.com/scummvm/scummvm/commit/55f93ab9f03f5a24fbb195356dcc5bda4b78c982
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-07-15T23:18:35+03:00
Commit Message:
FOOL: Fix signed/unsigned warnings
getNextEvent() is called with negative masks
Changed paths:
engines/fool/fool_game.cpp
engines/fool/fool_game.h
diff --git a/engines/fool/fool_game.cpp b/engines/fool/fool_game.cpp
index a556b560cb0..30afa30aa03 100644
--- a/engines/fool/fool_game.cpp
+++ b/engines/fool/fool_game.cpp
@@ -686,7 +686,7 @@ void FoolGame::sub_128_bde(int16 unk6, int16 unk5, int16 unk4, int16 unk3, int16
storyDrawZoom();
}
-void FoolGame::getNextEvent(uint32 unk1) {
+void FoolGame::getNextEvent(int32 unk1) {
// 128:0c6a
// This function is usually called at the start of an event processing loop,
diff --git a/engines/fool/fool_game.h b/engines/fool/fool_game.h
index 953ad23b038..14af5f227ef 100644
--- a/engines/fool/fool_game.h
+++ b/engines/fool/fool_game.h
@@ -131,7 +131,7 @@ public:
void drawTextCenter(const Common::U32String &str, int16 yPos); // sub_128_918
void zoomRect(int16 startTop, int16 startLeft, int16 startBottom, int16 startRight, int16 endTop, int16 endLeft, int16 endBottom, int16 endRight, int16 patternID, PatternMode mode, int16 steps); // sub_128_962
void sub_128_bde(int16 unk6, int16 unk5, int16 unk4, int16 unk3, int16 unk2, int16 unk1);
- void getNextEvent(uint32 mask); // sub_128_c6a
+ void getNextEvent(int32 mask); // sub_128_c6a
void flashRect(int16 top, int16 left, int16 bottom, int16 right, int16 millis); // sub_128_d34
void showChoiceModal(uint16 font, int16 lineCount, int16 buttonCount, bool beep); // sub_128_dfe
Commit: 222ba6fb7cf4f0086b75ba4caa46dcf7812e37c2
https://github.com/scummvm/scummvm/commit/222ba6fb7cf4f0086b75ba4caa46dcf7812e37c2
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-07-15T23:18:35+03:00
Commit Message:
MACGUI: Fix signed/unsigned warnings
GetNextEvent() is called with negative event masks
Changed paths:
graphics/mactoolbox/toolbox.cpp
graphics/mactoolbox/toolbox.h
diff --git a/graphics/mactoolbox/toolbox.cpp b/graphics/mactoolbox/toolbox.cpp
index 957806ef626..ba7dadf0d4f 100644
--- a/graphics/mactoolbox/toolbox.cpp
+++ b/graphics/mactoolbox/toolbox.cpp
@@ -335,7 +335,7 @@ void Toolbox::FlushEvents(uint32 eventMask, uint32 stopMask) {
//}
}
-bool Toolbox::GetNextEvent(uint32 eventMask, EventRecord &theEvent) {
+bool Toolbox::GetNextEvent(int32 eventMask, EventRecord &theEvent) {
_pumpEvents();
if (!_events.empty() && eventMask) {
for (auto it = _events.begin(); it != _events.end(); ++it) {
diff --git a/graphics/mactoolbox/toolbox.h b/graphics/mactoolbox/toolbox.h
index 47934fd05ab..0af123d04c3 100644
--- a/graphics/mactoolbox/toolbox.h
+++ b/graphics/mactoolbox/toolbox.h
@@ -604,7 +604,7 @@ public:
// available event of any type designated by the mask, subject to the priority rules discussed above
// under "Priority of Events". If no event of any of the designated types is available, GetNextEvent
// returns a null event.
- bool GetNextEvent(uint32 eventMask, EventRecord &theEvent);
+ bool GetNextEvent(int32 eventMask, EventRecord &theEvent);
// FUNCTION TickCount : LONGINT;
// TickCount returns the current number of ticks (sixtieths of a second) since the system last started
More information about the Scummvm-git-logs
mailing list