[Scummvm-git-logs] scummvm master -> 10c96e0912c838dadfae51593af3087a1f809936

[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:
fc80622d43 JANITORIAL: FREESCAPE: use float literal for float variable
87fe26b2a6 JANITIORIAL: FREESCAPE: add extra cast to silence GCC warning
7e1cf6a3fc JANITORIAL: NANCY: resolve signedness conflicts
10c96e0912 JANITORIAL: DIRECTOR: resolve signedness conflicts


Commit: fc80622d437a8c89a3b374a159bbb5816f7663eb
    https://github.com/scummvm/scummvm/commit/fc80622d437a8c89a3b374a159bbb5816f7663eb
Author: Michael (michael_kuerbis at web.de)
Date: 2026-04-03T22:36:56+03:00

Commit Message:
JANITORIAL: FREESCAPE: use float literal for float variable

Changed paths:
    engines/freescape/movement.cpp


diff --git a/engines/freescape/movement.cpp b/engines/freescape/movement.cpp
index 1a64593c57b..81d389cecb9 100644
--- a/engines/freescape/movement.cpp
+++ b/engines/freescape/movement.cpp
@@ -214,7 +214,7 @@ void FreescapeEngine::activate() {
 	float ndcY = 1.0f - (2.0f * (_crossairPosition.y - _viewArea.top) / _viewArea.height());
 
 	float fovHorizontalRad = (float)(75.0f * M_PI / 180.0f);
-	float aspectRatio = 1.6;
+	float aspectRatio = 1.6f;
 	float fovVerticalRad = 2.0f * atan(tan(fovHorizontalRad / 2.0f) / aspectRatio);
 
 	float angleOffsetX = atan(ndcX * tan(fovHorizontalRad / 2.0f)) * 180.0f / M_PI;


Commit: 87fe26b2a6337921eec4d1e21593ceac31a7b6b0
    https://github.com/scummvm/scummvm/commit/87fe26b2a6337921eec4d1e21593ceac31a7b6b0
Author: Michael (michael_kuerbis at web.de)
Date: 2026-04-03T22:36:56+03:00

Commit Message:
JANITIORIAL: FREESCAPE: add extra cast to silence GCC warning

Changed paths:
    engines/freescape/games/eclipse/opl.music.cpp


diff --git a/engines/freescape/games/eclipse/opl.music.cpp b/engines/freescape/games/eclipse/opl.music.cpp
index 77b9d0e5297..7953f8afc1f 100644
--- a/engines/freescape/games/eclipse/opl.music.cpp
+++ b/engines/freescape/games/eclipse/opl.music.cpp
@@ -448,7 +448,7 @@ byte EclipseOPLMusicPlayer::readPatternByte(int channel) {
 }
 
 byte EclipseOPLMusicPlayer::clampNote(byte note) const {
-	return note > kMaxNote ? kMaxNote : note;
+	return note > kMaxNote ? static_cast<byte>(kMaxNote) : note;
 }
 
 // ============================================================================


Commit: 7e1cf6a3fcdac92605dd188ea49376a810ae603e
    https://github.com/scummvm/scummvm/commit/7e1cf6a3fcdac92605dd188ea49376a810ae603e
Author: Michael (michael_kuerbis at web.de)
Date: 2026-04-03T22:36:56+03:00

Commit Message:
JANITORIAL: NANCY: resolve signedness conflicts

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


diff --git a/engines/nancy/action/puzzle/memorypuzzle.cpp b/engines/nancy/action/puzzle/memorypuzzle.cpp
index b22bcae8a6e..70f7b1e61b7 100644
--- a/engines/nancy/action/puzzle/memorypuzzle.cpp
+++ b/engines/nancy/action/puzzle/memorypuzzle.cpp
@@ -134,7 +134,7 @@ void MemoryPuzzle::initCards() {
 			for (int i = 0; i < kCardsPerTab; ++i) {
 				if (_cards[base + i].typeId != -1)
 					continue;
-				if (nextType >= _numPairs)
+				if (static_cast<uint32>(nextType) >= _numPairs)
 					break; // all types used up for this tab
 
 				_cards[base + i].typeId = nextType;
@@ -154,7 +154,7 @@ void MemoryPuzzle::initCards() {
 		for (int i = 0; i < totalCards; ++i) {
 			if (_cards[i].typeId != -1)
 				continue;
-			if (nextType >= _numPairs)
+			if (static_cast<uint32>(nextType) >= _numPairs)
 				break;
 
 			_cards[i].typeId = nextType;
@@ -329,7 +329,7 @@ void MemoryPuzzle::handleInput(NancyInput &input) {
 }
 
 void MemoryPuzzle::checkIfSolved() {
-	if (_matchedPairs >= _requiredPairs)
+	if (static_cast<uint32>(_matchedPairs) >= _requiredPairs)
 		_isSolved = true;
 }
 


Commit: 10c96e0912c838dadfae51593af3087a1f809936
    https://github.com/scummvm/scummvm/commit/10c96e0912c838dadfae51593af3087a1f809936
Author: Michael (michael_kuerbis at web.de)
Date: 2026-04-03T22:36:56+03:00

Commit Message:
JANITORIAL: DIRECTOR: resolve signedness conflicts

Changed paths:
    engines/director/score.cpp
    engines/director/sprite.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index fc6f565f73a..386eddc8bff 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -996,7 +996,7 @@ void Score::updateSprites(RenderMode mode, bool withClean) {
 	// We've updated the channels from the frame, reset the copyback mask so that e.g.
 	// disabling the puppet flag copies all the data as expected.
 	for (auto &it : _currentFrame->_sprites) {
-		it->_copyBackMask = kSCBNoMask;
+		it->_copyBackMask = static_cast<uint32>(kSCBNoMask);
 	}
 }
 
@@ -2143,7 +2143,7 @@ bool Score::loadFrame(int frameNum, bool loadCast) {
 	for (auto &it : _currentFrame->_sprites) {
 		if (frameNum <= (int)_curFrameNumber) {
 			// starting from rewind, copy back everything
-			it->_copyBackMask = -1;
+			it->_copyBackMask = static_cast<uint32>(-1);
 		} else {
 			// starting at delta, only copy back changes
 			it->_copyBackMask = 0;
diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index da48a88863a..850abd687e9 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -45,7 +45,7 @@ Sprite::Sprite(Frame *frame) {
 }
 
 void Sprite::reset() {
-	_copyBackMask = kSCBNoMask;
+	_copyBackMask = static_cast<uint32>(kSCBNoMask);
 	_scriptId = CastMemberID(0, 0);
 	_colorcode = 0;
 	_blendAmount = 0;