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

[kelmer44]

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

Summary:
f8c7090994 PELROCK: Consolidate switch cases that send alfred to jail. PVS-Studio V1037


Commit: f8c709099407b978f2e5b20b7f615d5835f06d11
    https://github.com/scummvm/scummvm/commit/f8c709099407b978f2e5b20b7f615d5835f06d11
Author: kelmer (kelmer at gmail.com)
Date: 2026-05-28T09:52:58+02:00

Commit Message:
PELROCK: Consolidate switch cases that send alfred to jail. PVS-Studio V1037

Changed paths:
    engines/pelrock/actions.cpp


diff --git a/engines/pelrock/actions.cpp b/engines/pelrock/actions.cpp
index daed2b2fdbb..54c8c359314 100644
--- a/engines/pelrock/actions.cpp
+++ b/engines/pelrock/actions.cpp
@@ -447,6 +447,8 @@ void PelrockEngine::dialogActionTrigger(uint16 actionTrigger, byte room, byte ro
 	case 352:
 	case 355:
 	case 291:
+	case 285:
+	case 363:
 		toJail();
 		break;
 	case 356:
@@ -457,9 +459,6 @@ void PelrockEngine::dialogActionTrigger(uint16 actionTrigger, byte room, byte ro
 	case 366:
 		_state->setCurrentRoot(room, rootIndex + 1, 0);
 		break;
-	case 363:
-		toJail();
-		break;
 	case 367: // accept riddle
 		_state->setCurrentRoot(room, 27, 0);
 		walkAndAction(_room->findHotspotByExtra(467), TALK);
@@ -564,9 +563,6 @@ void PelrockEngine::dialogActionTrigger(uint16 actionTrigger, byte room, byte ro
 		addInventoryItem(84);
 		_state->setCurrentRoot(room, rootIndex + 1, 0);
 		break;
-	case 285:
-		toJail();
-		break;
 	case 374:
 	case 372:
 	case 373: