[Scummvm-git-logs] scummvm master -> 2dceb551607a59f5ab16fcfc61ff62c210183183

neuromancer noreply at scummvm.org
Thu Nov 5 10:35:43 UTC 2026


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:
a4cb2d7581 HOLLYWOOD: simplified sharedHandler condition. PVS-Studio V560
f8ca934d48 HOLLYWOOD: simplified similar case conditions. PVS-Studio V1037
5c3a517b90 HOLLYWOOD: simplified some redundant elseif conditions. PVS-Studio V560
2dceb55160 HOLLYWOOD: remove kGameplayVerbPanelTopY. PVS-Studio V590


Commit: a4cb2d7581cc78cac86daa52c56258cc322a130f
    https://github.com/scummvm/scummvm/commit/a4cb2d7581cc78cac86daa52c56258cc322a130f
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-05T11:32:09+01:00

Commit Message:
HOLLYWOOD: simplified sharedHandler condition. PVS-Studio V560

Changed paths:
    engines/hollywood/monsters/gameplay/inventory_actions.cpp


diff --git a/engines/hollywood/monsters/gameplay/inventory_actions.cpp b/engines/hollywood/monsters/gameplay/inventory_actions.cpp
index 601297a0633..02974f531bf 100644
--- a/engines/hollywood/monsters/gameplay/inventory_actions.cpp
+++ b/engines/hollywood/monsters/gameplay/inventory_actions.cpp
@@ -1009,15 +1009,7 @@ bool dispatchSharedInventoryAction(HollywoodEngine *vm, GameplayLoopDelegate *de
 		uint16 handlerId, byte owner) {
 	// Shared handlers from InstallSceneActionCallbackTable (0x004d6000);
 	// main-scene handlers are dispatched separately.
-	const bool sharedHandler =
-		handlerId == 0 || handlerId == 1 || handlerId == 35 ||
-		handlerId == 41 || handlerId == 45 || handlerId == 49 ||
-		(handlerId >= 2 && handlerId <= 34) ||
-		handlerId == 36 || handlerId == 37 ||
-		handlerId == 38 || handlerId == 39 || handlerId == 40 ||
-		handlerId == 42 || handlerId == 43 || handlerId == 44 ||
-		handlerId == 46 || handlerId == 47 || handlerId == 48 ||
-		(handlerId >= 50 && handlerId <= 71);
+	const bool sharedHandler = handlerId <= 71;
 	const bool ronHandler = owner == 0 && isRonInventoryAction(handlerId);
 	if (!sharedHandler && !ronHandler)
 		return false;


Commit: f8ca934d4859fe04d80e6e994f54d9bece185a19
    https://github.com/scummvm/scummvm/commit/f8ca934d4859fe04d80e6e994f54d9bece185a19
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-05T11:32:09+01:00

Commit Message:
HOLLYWOOD: simplified similar case conditions. PVS-Studio V1037

Changed paths:
    engines/hollywood/monsters/gameplay/options_menu.cpp
    engines/hollywood/monsters/scenes/playable/scene1080.cpp
    engines/hollywood/monsters/scenes/playable/scene4030.cpp
    engines/hollywood/monsters/scenes/playable/scene5010.cpp
    engines/hollywood/monsters/scenes/playable/scene5080.cpp
    engines/hollywood/monsters/scenes/playable/scene6050.cpp


diff --git a/engines/hollywood/monsters/gameplay/options_menu.cpp b/engines/hollywood/monsters/gameplay/options_menu.cpp
index dd00dc2885e..3173602ccc2 100644
--- a/engines/hollywood/monsters/gameplay/options_menu.cpp
+++ b/engines/hollywood/monsters/gameplay/options_menu.cpp
@@ -373,40 +373,10 @@ void GameplayOptionsMenu::handleLeftClick(uint16 cursorX, uint16 cursorY, bool &
 		refreshTestAudio = true;
 		break;
 	case kHitMusicDown:
-		if (applyVolumeHitAction(action)) {
-			syncSettings = true;
-			refreshTestAudio = true;
-			startHeldVolume(action);
-		}
-		break;
 	case kHitMusicUp:
-		if (applyVolumeHitAction(action)) {
-			syncSettings = true;
-			refreshTestAudio = true;
-			startHeldVolume(action);
-		}
-		break;
 	case kHitSoundDown:
-		if (applyVolumeHitAction(action)) {
-			syncSettings = true;
-			refreshTestAudio = true;
-			startHeldVolume(action);
-		}
-		break;
 	case kHitSoundUp:
-		if (applyVolumeHitAction(action)) {
-			syncSettings = true;
-			refreshTestAudio = true;
-			startHeldVolume(action);
-		}
-		break;
 	case kHitVoiceDown:
-		if (applyVolumeHitAction(action)) {
-			syncSettings = true;
-			refreshTestAudio = true;
-			startHeldVolume(action);
-		}
-		break;
 	case kHitVoiceUp:
 		if (applyVolumeHitAction(action)) {
 			syncSettings = true;
@@ -415,11 +385,6 @@ void GameplayOptionsMenu::handleLeftClick(uint16 cursorX, uint16 cursorY, bool &
 		}
 		break;
 	case kHitTextSpeedDown:
-		if (applyVolumeHitAction(action)) {
-			syncSettings = true;
-			startHeldVolume(action);
-		}
-		break;
 	case kHitTextSpeedUp:
 		if (applyVolumeHitAction(action)) {
 			syncSettings = true;
diff --git a/engines/hollywood/monsters/scenes/playable/scene1080.cpp b/engines/hollywood/monsters/scenes/playable/scene1080.cpp
index 32108a0ea09..b1d0f23ed0a 100644
--- a/engines/hollywood/monsters/scenes/playable/scene1080.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene1080.cpp
@@ -158,6 +158,8 @@ bool Scene1080::dispatchCustomSceneAction(uint16 handlerId) {
 	case 178: // Usar globo inflado con gas (use the balloon directly from inventory, without a target).
 		// The original shared handler (0x004d1e50) calls 314 in scene 1080
 		// while Francois is present; otherwise it gives a refusal.
+	case 314: // Scene-local balloon distraction callback (0x00417740).
+		// Invoked by 178, not a separate verb: plays the entire release/reaction sequence.
 		handleFrancoisDistraction();
 		return true;
 	case 301: // Ir a escalera (go to stairs).
@@ -202,10 +204,6 @@ bool Scene1080::dispatchCustomSceneAction(uint16 handlerId) {
 	case 313: // Mirar platos sucios (look at dirty plates).
 		beginSecondarySpeechLine(11, 0);
 		return true;
-	case 314: // Scene-local balloon distraction callback (0x00417740).
-		// Invoked by 178, not a separate verb: plays the entire release/reaction sequence.
-		handleFrancoisDistraction();
-		return true;
 	default:
 		return false;
 	}
diff --git a/engines/hollywood/monsters/scenes/playable/scene4030.cpp b/engines/hollywood/monsters/scenes/playable/scene4030.cpp
index f1cf86ac5d9..b9aa7ff825d 100644
--- a/engines/hollywood/monsters/scenes/playable/scene4030.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene4030.cpp
@@ -343,14 +343,12 @@ bool Scene4030::dispatchCustomSceneAction(uint16 handlerId) {
 		beginSecondarySpeechLine(11, 0);
 		return true;
 	case 315: // Coger candil (take oil lamp): not movable here.
+	case 317: // Coger esqueleto sentado (take seated skeleton): too weak.
 		beginSecondarySpeechLine(14, 0);
 		return true;
 	case 316: // Mirar candil (look at oil lamp).
 		beginSecondarySpeechLine(15, _vm->gameState().scene4030LooseBoneState != 0 ? 1 : 0);
 		return true;
-	case 317: // Coger esqueleto sentado (take seated skeleton): too weak.
-		beginSecondarySpeechLine(14, 0);
-		return true;
 	case 318: // Mirar esqueleto sentado (look at seated skeleton).
 		beginSecondarySpeechLine(15, 0);
 		return true;
diff --git a/engines/hollywood/monsters/scenes/playable/scene5010.cpp b/engines/hollywood/monsters/scenes/playable/scene5010.cpp
index 02b3f7114c4..e71c4e8383e 100644
--- a/engines/hollywood/monsters/scenes/playable/scene5010.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene5010.cpp
@@ -183,23 +183,17 @@ bool Scene5010::dispatchCustomSceneAction(uint16 handlerId) {
 		prepareMineTransport(true);
 		return true;
 	case 305: // Mirar tunel oscuro (look at dark tunnel).
+	case 307: // Mirar tunel oscuro (look at dark tunnel), duplicate hotspot.
 		beginSecondarySpeechLine(5, 0);
 		return true;
 	case 306: // Usar/entrar tunel oscuro (use/enter dark tunnel): short transport branch.
 		prepareMineTransport(false);
 		return true;
-	case 307: // Mirar tunel oscuro (look at dark tunnel), duplicate hotspot.
-		beginSecondarySpeechLine(5, 0);
-		return true;
 	case 308: // Mirar sistema de agujas (look at switch system).
-		beginSecondarySpeechLine(6, 0);
-		return true;
-	case 309: // Usar sistema de agujas (use switch system): choose mine destination.
-		runSwitchPanel();
-		return true;
 	case 310: // Mirar sistema de agujas (look at switch system), duplicate hotspot.
 		beginSecondarySpeechLine(6, 0);
 		return true;
+	case 309: // Usar sistema de agujas (use switch system): choose mine destination.
 	case 311: // Usar sistema de agujas (use switch system), duplicate hotspot.
 		runSwitchPanel();
 		return true;
diff --git a/engines/hollywood/monsters/scenes/playable/scene5080.cpp b/engines/hollywood/monsters/scenes/playable/scene5080.cpp
index c830cf65341..54899fa36b8 100644
--- a/engines/hollywood/monsters/scenes/playable/scene5080.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene5080.cpp
@@ -144,6 +144,7 @@ void Scene5080::advanceCustomGameplayLoop(uint32 delta) {
 bool Scene5080::dispatchCustomSceneAction(uint16 handlerId) {
 	switch (handlerId) {
 	case 183: // Mirar libro (look at book): use Karl's book description.
+	case 303: // Dormant scene-local alias for looking at Karl's book.
 		beginStaticSecondarySpeechLine(0xaa, 0);
 		return true;
 	case 301: // Usar vagoneta (use mine cart): return to the switch room.
@@ -152,9 +153,6 @@ bool Scene5080::dispatchCustomSceneAction(uint16 handlerId) {
 	case 302: // Coger libro (take book): play the pickup and grant Karl's book.
 		runBookPickup();
 		return true;
-	case 303: // Dormant scene-local alias for looking at Karl's book.
-		beginStaticSecondarySpeechLine(0xaa, 0);
-		return true;
 	case 304: // Mirar armario (look at wardrobe): Karl keeps his belongings here.
 		beginSecondarySpeechLine(2, 0);
 		return true;
diff --git a/engines/hollywood/monsters/scenes/playable/scene6050.cpp b/engines/hollywood/monsters/scenes/playable/scene6050.cpp
index e738bd67a0f..289059cb094 100644
--- a/engines/hollywood/monsters/scenes/playable/scene6050.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene6050.cpp
@@ -263,14 +263,12 @@ bool Scene6050::dispatchCustomSceneAction(uint16 handlerId) {
 		beginSecondarySpeechLine(state.scene6050GuardAllowsEntry ? 6 : 4, 0);
 		return true;
 	case 306: // Usar/abrir puerta principal (use/open main door): still closed.
+	case 308: // Usar/abrir segunda puerta (use/open second door): still closed.
 		beginSecondarySpeechLine(5, 0);
 		return true;
 	case 307: // Mirar puerta al piso superior (look at upstairs door).
 		beginSecondarySpeechLine(4, state.scene6050GuardAllowsEntry ? 1 : 0);
 		return true;
-	case 308: // Usar/abrir segunda puerta (use/open second door): still closed.
-		beginSecondarySpeechLine(5, 0);
-		return true;
 	case 309: // Hablar con guardia (talk to guard).
 		runGuardDialogue();
 		return true;


Commit: 5c3a517b90391e0b3e3375edc713ee31c0f8a98d
    https://github.com/scummvm/scummvm/commit/5c3a517b90391e0b3e3375edc713ee31c0f8a98d
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-05T11:32:09+01:00

Commit Message:
HOLLYWOOD: simplified some redundant elseif conditions. PVS-Studio V560

Changed paths:
    engines/hollywood/monsters/scenes/playable/scene1020.cpp
    engines/hollywood/monsters/scenes/playable/scene7010.cpp
    engines/hollywood/runaway/scene5030.cpp


diff --git a/engines/hollywood/monsters/scenes/playable/scene1020.cpp b/engines/hollywood/monsters/scenes/playable/scene1020.cpp
index 047b43bf3fa..dad7b631d9f 100644
--- a/engines/hollywood/monsters/scenes/playable/scene1020.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene1020.cpp
@@ -189,8 +189,8 @@ bool Scene1020::shouldLoadArenaChunk(uint index) const {
 	if (index <= 13)
 		return true;
 	if (isFirstEntryState())
-		return index >= 14 && index <= 19;
-	return index >= 20 && index <= 22;
+		return index <= 19;
+	return index >= 20;
 }
 
 void Scene1020::initializeCustomPreviewState() {
diff --git a/engines/hollywood/monsters/scenes/playable/scene7010.cpp b/engines/hollywood/monsters/scenes/playable/scene7010.cpp
index cb2bdf74dd7..2bebfa4a24d 100644
--- a/engines/hollywood/monsters/scenes/playable/scene7010.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene7010.cpp
@@ -318,7 +318,7 @@ void Scene7010::runSueEntryPath(int startX, int startY, int targetX, int targetY
 			false, 0, 0, 0, 0, _activeActorDrawOrderMode);
 		presentFrame();
 
-		while (!_skipRequested && !stepAdvanced && !Engine::shouldQuit()) {
+		while (!_skipRequested && !Engine::shouldQuit()) {
 			if (pollEvents(true)) {
 				if (Engine::shouldQuit() || _vm->isSceneRestartRequested()) {
 					_actorPathPlaybackActive = false;
diff --git a/engines/hollywood/runaway/scene5030.cpp b/engines/hollywood/runaway/scene5030.cpp
index f94609d3e52..88bb1b98464 100644
--- a/engines/hollywood/runaway/scene5030.cpp
+++ b/engines/hollywood/runaway/scene5030.cpp
@@ -859,7 +859,7 @@ void RunawayScene5030::updateAction() {
 		}
 		if (_step >= 81)
 			finishAction();
-	} else if (_action != kNone && _action != kWalkingAction && _action != kPeekConversation) {
+	} else if (_action != kNone && _action != kWalkingAction) {
 		_step = elapsed / 60;
 		uint length = 0;
 		switch (_action) {


Commit: 2dceb551607a59f5ab16fcfc61ff62c210183183
    https://github.com/scummvm/scummvm/commit/2dceb551607a59f5ab16fcfc61ff62c210183183
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-05T11:35:28+01:00

Commit Message:
HOLLYWOOD: remove kGameplayVerbPanelTopY. PVS-Studio V590

Changed paths:
    engines/hollywood/monsters/gameplay/game_loop.cpp


diff --git a/engines/hollywood/monsters/gameplay/game_loop.cpp b/engines/hollywood/monsters/gameplay/game_loop.cpp
index 007b8ad65a1..205a3b6adbc 100644
--- a/engines/hollywood/monsters/gameplay/game_loop.cpp
+++ b/engines/hollywood/monsters/gameplay/game_loop.cpp
@@ -39,7 +39,6 @@ const byte kGameplayLastStrip = 8;
 const uint32 kGameplayLoopTickMillis = 10;
 const uint32 kGameplayMaxFrameDeltaMillis = 250;
 const uint32 kGameplayPanelHoverMillis = 75;
-const uint16 kGameplayVerbPanelTopY = 0x19f;
 const uint16 kGameplayInventoryOpenY = 0x1df;
 const uint16 kGameplayInventoryCloseY = 0x122;
 const uint16 kGameplayVerbPanelStripWidth = 0x58;
@@ -691,8 +690,7 @@ void GameplayLoop::selectPanelStrip(byte stripIndex) {
 }
 
 byte GameplayLoop::panelStripAt(uint16 cursorX, uint16 cursorY) const {
-	if (cursorY < kGameplayVerbPanelTopY ||
-			cursorY < kGameplayVerbPanelStripTopY ||
+	if (cursorY < kGameplayVerbPanelStripTopY ||
 			cursorY >= kGameplayVerbPanelStripTopY + kGameplayVerbPanelStripHeight)
 		return 0;
 




More information about the Scummvm-git-logs mailing list