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

[bluegr]

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

Summary:
4d8b7b109d JANITORIAL: GUI: add extra cast to resolve signed/unsigned conflict
c30af2ca09 JANITORIAL: ALG: add extra casts to resolve signed/unsigned conflicts
bf98707187 JANITORIAL: NANCY: add extra cast to resolve signed/unsigned conflict
d54a43fb07 JANITORIAL: FREESCAPE: change arg type to resolve signed/unsigned conflicts


Commit: 4d8b7b109d4a3bd473b759aac37bfe5681f93682
    https://github.com/scummvm/scummvm/commit/4d8b7b109d4a3bd473b759aac37bfe5681f93682
Author: Michael (michael_kuerbis at web.de)
Date: 2026-03-15T21:20:50+02:00

Commit Message:
JANITORIAL: GUI: add extra cast to resolve signed/unsigned conflict

Changed paths:
    gui/widgets/popup.cpp


diff --git a/gui/widgets/popup.cpp b/gui/widgets/popup.cpp
index 056479cabc2..c6b34e1dd10 100644
--- a/gui/widgets/popup.cpp
+++ b/gui/widgets/popup.cpp
@@ -309,7 +309,7 @@ int PopUpDialog::findItem(int x, int y) const {
 		entry = (y - 2) / _lineHeight;
 		if (_twoColumns && x > _w / 2)
 			entry += _entriesPerColumn;
-		if (entry >= _entries.size())
+		if (entry >= static_cast<int>(_entries.size()))
 			entry = -1;
 	}
 	return entry;


Commit: c30af2ca09658d9db6fa425df46c0634f284531d
    https://github.com/scummvm/scummvm/commit/c30af2ca09658d9db6fa425df46c0634f284531d
Author: Michael (michael_kuerbis at web.de)
Date: 2026-03-15T21:20:50+02:00

Commit Message:
JANITORIAL: ALG: add extra casts to resolve signed/unsigned conflicts

Changed paths:
    engines/alg/logic/game_bountyhunter.cpp


diff --git a/engines/alg/logic/game_bountyhunter.cpp b/engines/alg/logic/game_bountyhunter.cpp
index ade8ae4b18b..154bda0e9a0 100644
--- a/engines/alg/logic/game_bountyhunter.cpp
+++ b/engines/alg/logic/game_bountyhunter.cpp
@@ -878,10 +878,10 @@ void GameBountyHunter::iconReset() {
 
 void GameBountyHunter::iconSetup() {
     uint16 usedFlags = 0;
-    _iconOrder[0] = randomUnusedInt(4, &usedFlags, -1);
-    _iconOrder[1] = randomUnusedInt(4, &usedFlags, -1);
-    _iconOrder[2] = randomUnusedInt(4, &usedFlags, -1);
-    _iconOrder[3] = randomUnusedInt(4, &usedFlags, -1);
+    _iconOrder[0] = randomUnusedInt(4, &usedFlags, (uint16)-1);
+    _iconOrder[1] = randomUnusedInt(4, &usedFlags, (uint16)-1);
+    _iconOrder[2] = randomUnusedInt(4, &usedFlags, (uint16)-1);
+    _iconOrder[3] = randomUnusedInt(4, &usedFlags, (uint16)-1);
     _iconOffset = 0;
     _iconCounter = 0;
 }
@@ -960,7 +960,7 @@ uint16 GameBountyHunter::randomUnusedInt(uint8 max, uint16 *mask, uint16 exclude
 	uint16 randomNum = 0;
 	// find an unused random number
 	while (true) {
-		randomNum = _rnd->getRandomNumber(max - 1);
+		randomNum = static_cast<uint16>(_rnd->getRandomNumber(max - 1));
 		// check if bit is already used
 		uint16 bit = 1 << randomNum;
 		if (!((*mask & bit) || randomNum == exclude)) {


Commit: bf987071872088e5f7255463e923504092230fce
    https://github.com/scummvm/scummvm/commit/bf987071872088e5f7255463e923504092230fce
Author: Michael (michael_kuerbis at web.de)
Date: 2026-03-15T21:20:50+02:00

Commit Message:
JANITORIAL: NANCY: add extra cast to resolve signed/unsigned conflict

Changed paths:
    engines/nancy/action/puzzle/orderingpuzzle.cpp


diff --git a/engines/nancy/action/puzzle/orderingpuzzle.cpp b/engines/nancy/action/puzzle/orderingpuzzle.cpp
index 047483734e7..68ad4100d2d 100644
--- a/engines/nancy/action/puzzle/orderingpuzzle.cpp
+++ b/engines/nancy/action/puzzle/orderingpuzzle.cpp
@@ -462,7 +462,7 @@ void OrderingPuzzle::handleInput(NancyInput &input) {
 	if (_itemsStayDown && g_nancy->_sound->isSoundPlaying(_pushDownSound)) {
 		canClick = false;
 	} else if (_puzzleType == kPiano) {
-		for (int i = 0; i < _hotspots.size(); ++i) {
+		for (uint i = 0; i < _hotspots.size(); ++i) {
 			if (_downItems[i]) {
 				canClick = false;
 				break;


Commit: d54a43fb0722305c14ca8d38ffac860c0a4e4931
    https://github.com/scummvm/scummvm/commit/d54a43fb0722305c14ca8d38ffac860c0a4e4931
Author: Michael (michael_kuerbis at web.de)
Date: 2026-03-15T21:20:50+02:00

Commit Message:
JANITORIAL: FREESCAPE: change arg type to resolve signed/unsigned conflicts

Changed paths:
    engines/freescape/objects/geometricobject.cpp
    engines/freescape/objects/geometricobject.h


diff --git a/engines/freescape/objects/geometricobject.cpp b/engines/freescape/objects/geometricobject.cpp
index bc5b1c6b80c..ff9cad736d8 100644
--- a/engines/freescape/objects/geometricobject.cpp
+++ b/engines/freescape/objects/geometricobject.cpp
@@ -484,7 +484,7 @@ void GeometricObject::draw(Renderer *gfx, float offset) {
 	}
 }
 
-void GeometricObject::setColor(int idx, int color) {
+void GeometricObject::setColor(uint idx, int color) {
 	assert(_colours);
 	assert(idx < _colours->size());
 	(*_colours)[idx] = color;
diff --git a/engines/freescape/objects/geometricobject.h b/engines/freescape/objects/geometricobject.h
index 6d7d4f12117..9a08ecf12b9 100644
--- a/engines/freescape/objects/geometricobject.h
+++ b/engines/freescape/objects/geometricobject.h
@@ -59,7 +59,7 @@ public:
 	void computeBoundingBox();
 	bool collides(const Math::AABB &boundingBox);
 	void draw(Freescape::Renderer *gfx, float offset = 0.0) override;
-	void setColor(int idx, int color);
+	void setColor(uint idx, int color);
 	bool isDrawable() override;
 	bool isPlanar() override;
 	bool _cyclingColors;