[Scummvm-git-logs] scummvm master -> 7a4cb6a17fb3675a9823b81fe2851f9c7752cee6

neuromancer noreply at scummvm.org
Tue Oct 27 19:37:43 UTC 2026


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:
67cbd9b8a3 HOLLYWOOD: fix signed/unsigned comparison warnings from buildbot
9d0034b95a HOLLYWOOD: fix mixed enum/integer types in conditional expression
7a4cb6a17f HOLLYWOOD: fix shadowing of the transition parameter


Commit: 67cbd9b8a3ebd89a0df844dcf63b4c69c38a9d60
    https://github.com/scummvm/scummvm/commit/67cbd9b8a3ebd89a0df844dcf63b4c69c38a9d60
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-10-27T20:23:18+01:00

Commit Message:
HOLLYWOOD: fix signed/unsigned comparison warnings from buildbot

Changed paths:
    engines/hollywood/monsters/gameplay/panel_art.cpp
    engines/hollywood/monsters/music.cpp
    engines/hollywood/monsters/scenes/playable/scene3030.cpp
    engines/hollywood/monsters/scenes/playable/scene5010.cpp
    engines/hollywood/runaway/font.cpp
    engines/hollywood/runaway/scene5030.cpp


diff --git a/engines/hollywood/monsters/gameplay/panel_art.cpp b/engines/hollywood/monsters/gameplay/panel_art.cpp
index 2152c2e7f28..cf0c397355c 100644
--- a/engines/hollywood/monsters/gameplay/panel_art.cpp
+++ b/engines/hollywood/monsters/gameplay/panel_art.cpp
@@ -473,7 +473,7 @@ void GameplayPanelArt::copySceneCaptionBand(Graphics::Surface &surface,
 		const uint sceneY = viewportYOffset + screenY + row;
 		if (sceneY >= HollywoodEngine::kSceneBufferHeight ||
 				sceneY >= (uint)sceneComposite.h ||
-				viewportXOffset + HollywoodEngine::kScreenWidth > (uint)sceneComposite.w ||
+				(uint)viewportXOffset + HollywoodEngine::kScreenWidth > (uint)sceneComposite.w ||
 				screenY + row >= (uint)surface.h)
 			continue;
 
diff --git a/engines/hollywood/monsters/music.cpp b/engines/hollywood/monsters/music.cpp
index ebbe3d3a23b..e7df56c703a 100644
--- a/engines/hollywood/monsters/music.cpp
+++ b/engines/hollywood/monsters/music.cpp
@@ -154,7 +154,7 @@ bool MusicPlayer::isPlaying() const {
 }
 
 bool MusicPlayer::readCueSpan(const Common::Path &fileName, uint16 cueId, uint32 &start, uint32 &size) const {
-	if ((cueId + 1) * 4 >= kMusicCueTableSize) {
+	if ((cueId + 1U) * 4 >= kMusicCueTableSize) {
 		warning("Invalid %s cue id %u", fileName.toString().c_str(), cueId);
 		return false;
 	}
@@ -258,7 +258,7 @@ bool SpeechPlayer::isPlaying() const {
 }
 
 bool SpeechPlayer::readSampleSpan(uint16 sampleId, uint32 &start, uint32 &size) const {
-	if ((sampleId + 1) * 4 >= kSpeechCueTableSize) {
+	if ((sampleId + 1U) * 4 >= kSpeechCueTableSize) {
 		warning("Invalid %s sample id %u", kSpeechArchiveName, sampleId);
 		return false;
 	}
@@ -356,7 +356,7 @@ bool SoundBank0Player::isPlaying() const {
 }
 
 bool SoundBank0Player::readSampleSpan(uint16 sampleId, uint32 &start, uint32 &size) const {
-	if ((sampleId + 1) * 4 >= kSoundBank0CueTableSize) {
+	if ((sampleId + 1U) * 4 >= kSoundBank0CueTableSize) {
 		warning("Invalid %s sample id %u", _archiveName.toString().c_str(), sampleId);
 		return false;
 	}
diff --git a/engines/hollywood/monsters/scenes/playable/scene3030.cpp b/engines/hollywood/monsters/scenes/playable/scene3030.cpp
index a40fb1ca31f..fe869759713 100644
--- a/engines/hollywood/monsters/scenes/playable/scene3030.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene3030.cpp
@@ -335,7 +335,7 @@ void Scene3030::runMachineActivationSequence() {
 	bool actionReleased = false;
 	// Ron holds frame 15 until the machine effect reaches frame 5.
 	while ((actionFrame + 1 < ARRAYSIZE(kScene3030MachineActionFrameMap) ||
-			effectFrame + 1 < kScene3030MachineEffectDescriptorCount) &&
+			effectFrame + 1U < kScene3030MachineEffectDescriptorCount) &&
 			!Engine::shouldQuit() && !_vm->isSceneRestartRequested()) {
 		if (actionFrame + 1 < ARRAYSIZE(kScene3030MachineActionFrameMap) &&
 				(actionFrame < 15 || actionReleased)) {
@@ -349,7 +349,7 @@ void Scene3030::runMachineActivationSequence() {
 			}
 		}
 
-		if (effectStarted && effectFrame + 1 < kScene3030MachineEffectDescriptorCount) {
+		if (effectStarted && effectFrame + 1U < kScene3030MachineEffectDescriptorCount) {
 			++effectFrame;
 			_sceneLayers.setVisibleLayerFrame(kScene3030MachineEffectLayer, effectFrame);
 			if (effectFrame == 5) {
diff --git a/engines/hollywood/monsters/scenes/playable/scene5010.cpp b/engines/hollywood/monsters/scenes/playable/scene5010.cpp
index b0512954e30..e7d3d3cbe08 100644
--- a/engines/hollywood/monsters/scenes/playable/scene5010.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene5010.cpp
@@ -567,7 +567,7 @@ void Scene5010::drawSwitchPanelOverlay() {
 	byte *pixels = framebufferPixels(_sceneFramebuffer);
 	for (uint y = 0; y < HollywoodEngine::kScreenHeight; ++y) {
 		const uint rowOffset = y * HollywoodEngine::kSceneBufferWidth;
-		for (uint x = _viewportXOffset; x < _viewportXOffset + HollywoodEngine::kScreenWidth; ++x) {
+		for (uint x = _viewportXOffset; x < (uint)_viewportXOffset + HollywoodEngine::kScreenWidth; ++x) {
 			const uint offset = rowOffset + x;
 			pixels[offset] = _presentationPaletteRemapTable[pixels[offset]];
 		}
diff --git a/engines/hollywood/runaway/font.cpp b/engines/hollywood/runaway/font.cpp
index 16143538fc3..8aaf714787b 100644
--- a/engines/hollywood/runaway/font.cpp
+++ b/engines/hollywood/runaway/font.cpp
@@ -67,7 +67,7 @@ bool RunawayFont::load(bool menuFont) {
 		glyph.height = data[3];
 		glyph.width = data[4];
 		if (glyph.width > 28 || glyph.top + glyph.height > 28 ||
-				glyph.offset + glyph.width * glyph.height > _pixels.size())
+				(uint)glyph.offset + glyph.width * glyph.height > _pixels.size())
 			return false;
 	}
 	memcpy(_glyphMap, kGlyphMap, sizeof(_glyphMap));
diff --git a/engines/hollywood/runaway/scene5030.cpp b/engines/hollywood/runaway/scene5030.cpp
index 5fa2c6ead36..f94609d3e52 100644
--- a/engines/hollywood/runaway/scene5030.cpp
+++ b/engines/hollywood/runaway/scene5030.cpp
@@ -370,7 +370,7 @@ void RunawayScene5030::walkTo(Common::Point target) {
 
 void RunawayScene5030::say(uint16 row) {
 	stopSpeech();
-	if (row < 500 || row - 500 >= _voiceSamples.size())
+	if (row < 500 || row - 500U >= _voiceSamples.size())
 		return;
 	_globalSpeech = false;
 	_speechRow = row;


Commit: 9d0034b95a8364bf23d801b99392389448bb5de8
    https://github.com/scummvm/scummvm/commit/9d0034b95a8364bf23d801b99392389448bb5de8
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-10-27T20:25:32+01:00

Commit Message:
HOLLYWOOD: fix mixed enum/integer types in conditional expression

Changed paths:
    engines/hollywood/monsters/gameplay/dialogue_menu.cpp
    engines/hollywood/monsters/gameplay/game_loop.cpp
    engines/hollywood/monsters/gameplay/game_state.h


diff --git a/engines/hollywood/monsters/gameplay/dialogue_menu.cpp b/engines/hollywood/monsters/gameplay/dialogue_menu.cpp
index 1a461e9285e..25273a00575 100644
--- a/engines/hollywood/monsters/gameplay/dialogue_menu.cpp
+++ b/engines/hollywood/monsters/gameplay/dialogue_menu.cpp
@@ -113,7 +113,7 @@ byte DialogueMenu::choose(byte stageId, const Common::Array<DialogueChoiceRecord
 			if (redirectedChoice != choiceIndex && animateChoiceRedirect(redirectedChoice))
 				choiceIndex = redirectedChoice;
 			_vm->cursor()->leaveInteractiveMode();
-			return Engine::shouldQuit() ? kCancelledChoice : choiceIndex;
+			return Engine::shouldQuit() ? (byte)kCancelledChoice : choiceIndex;
 		}
 
 		g_system->delayMillis(kDialogueMenuTickMillis);
diff --git a/engines/hollywood/monsters/gameplay/game_loop.cpp b/engines/hollywood/monsters/gameplay/game_loop.cpp
index e9b2397a81d..45608bc2146 100644
--- a/engines/hollywood/monsters/gameplay/game_loop.cpp
+++ b/engines/hollywood/monsters/gameplay/game_loop.cpp
@@ -799,7 +799,7 @@ bool GameplayLoop::scrollInventoryPanelPreviousPage() {
 	if (firstVisibleSlot <= GameplayState::kInventoryFirstSlot)
 		return false;
 
-	firstVisibleSlot = firstVisibleSlot > 8 ? (byte)(firstVisibleSlot - 8) : GameplayState::kInventoryFirstSlot;
+	firstVisibleSlot = firstVisibleSlot > 8 ? (byte)(firstVisibleSlot - 8) : (byte)GameplayState::kInventoryFirstSlot;
 	gameState.inventoryPanelDirty = true;
 	return true;
 }
diff --git a/engines/hollywood/monsters/gameplay/game_state.h b/engines/hollywood/monsters/gameplay/game_state.h
index 3a34b27e85e..c17ca47b5d4 100644
--- a/engines/hollywood/monsters/gameplay/game_state.h
+++ b/engines/hollywood/monsters/gameplay/game_state.h
@@ -725,7 +725,7 @@ struct GameplayState {
 			return 0;
 
 		const byte itemCount = inventoryItemCountByOwner[owner] < kInventoryLastSlot ?
-			inventoryItemCountByOwner[owner] : kInventoryLastSlot;
+			inventoryItemCountByOwner[owner] : (byte)kInventoryLastSlot;
 		for (byte slot = kInventoryFirstSlot; slot <= itemCount; ++slot) {
 			if (inventorySlotItemIdByOwner[owner][slot] == itemId)
 				return slot;


Commit: 7a4cb6a17fb3675a9823b81fe2851f9c7752cee6
    https://github.com/scummvm/scummvm/commit/7a4cb6a17fb3675a9823b81fe2851f9c7752cee6
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-10-27T20:31:10+01:00

Commit Message:
HOLLYWOOD: fix shadowing of the transition parameter

Changed paths:
    engines/hollywood/monsters/scenes/animation_player.h


diff --git a/engines/hollywood/monsters/scenes/animation_player.h b/engines/hollywood/monsters/scenes/animation_player.h
index 5b12847f56f..7b99477ddc0 100644
--- a/engines/hollywood/monsters/scenes/animation_player.h
+++ b/engines/hollywood/monsters/scenes/animation_player.h
@@ -202,9 +202,9 @@ public:
 		return playInternal(target, range, true);
 	}
 
-	bool transitionAndPresent(byte &targetFrame, const AnimationTransition &transition) {
+	bool transitionAndPresent(byte &targetFrame, const AnimationTransition &transitionSpec) {
 		FrameValueTarget target(targetFrame);
-		return transitionInternal(target, transition, true);
+		return transitionInternal(target, transitionSpec, true);
 	}
 
 	template<class FrameTarget>
@@ -218,13 +218,13 @@ public:
 	}
 
 	template<class FrameTarget>
-	bool transition(FrameTarget &target, const AnimationTransition &transition) {
-		return transitionInternal(target, transition, false);
+	bool transition(FrameTarget &target, const AnimationTransition &transitionSpec) {
+		return transitionInternal(target, transitionSpec, false);
 	}
 
 	template<class FrameTarget>
-	bool transitionAndPresent(FrameTarget &target, const AnimationTransition &transition) {
-		return transitionInternal(target, transition, true);
+	bool transitionAndPresent(FrameTarget &target, const AnimationTransition &transitionSpec) {
+		return transitionInternal(target, transitionSpec, true);
 	}
 
 private:
@@ -276,14 +276,14 @@ private:
 	}
 
 	template<class FrameTarget>
-	bool transitionInternal(FrameTarget &target, const AnimationTransition &transition,
+	bool transitionInternal(FrameTarget &target, const AnimationTransition &transitionSpec,
 			bool presentBoundaryFrames) {
-		if (transition.firstFrame > 0xff || transition.lastFrame > 0xff ||
+		if (transitionSpec.firstFrame > 0xff || transitionSpec.lastFrame > 0xff ||
 				_delegate.animationPlaybackShouldStop())
 			return false;
 
-		const int step = transition.firstFrame <= transition.lastFrame ? 1 : -1;
-		int frame = transition.firstFrame;
+		const int step = transitionSpec.firstFrame <= transitionSpec.lastFrame ? 1 : -1;
+		int frame = transitionSpec.firstFrame;
 		target.setFrame((byte)frame);
 		if (presentBoundaryFrames) {
 			_delegate.presentAnimationFrame();
@@ -291,8 +291,8 @@ private:
 				return false;
 		}
 
-		while (frame != (int)transition.lastFrame) {
-			if (_delegate.waitForAnimationFrame(transition.frameMillis, transition.allowSkip)) {
+		while (frame != (int)transitionSpec.lastFrame) {
+			if (_delegate.waitForAnimationFrame(transitionSpec.frameMillis, transitionSpec.allowSkip)) {
 				if (!_delegate.consumeAnimationFastForwardRequest())
 					return false;
 				break;
@@ -301,7 +301,7 @@ private:
 			target.setFrame((byte)frame);
 		}
 
-		target.setFrame(transition.finalFrame);
+		target.setFrame(transitionSpec.finalFrame);
 		if (presentBoundaryFrames) {
 			_delegate.presentAnimationFrame();
 			if (_delegate.animationPlaybackShouldStop())




More information about the Scummvm-git-logs mailing list