[Scummvm-git-logs] scummvm master -> 83f02aa429738f1153ce84a20312e50cc092f3d6

[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:
83f02aa429 PELROCK: Consolidate switch cases. PVS-Studio V1037


Commit: 83f02aa429738f1153ce84a20312e50cc092f3d6
    https://github.com/scummvm/scummvm/commit/83f02aa429738f1153ce84a20312e50cc092f3d6
Author: kelmer (kelmer at gmail.com)
Date: 2026-05-26T16:55:57+02:00

Commit Message:
PELROCK: Consolidate switch cases. PVS-Studio V1037

Changed paths:
    engines/pelrock/actions.cpp
    engines/pelrock/menu.cpp


diff --git a/engines/pelrock/actions.cpp b/engines/pelrock/actions.cpp
index 0c9f75956c4..daed2b2fdbb 100644
--- a/engines/pelrock/actions.cpp
+++ b/engines/pelrock/actions.cpp
@@ -327,6 +327,7 @@ void PelrockEngine::dialogActionTrigger(uint16 actionTrigger, byte room, byte ro
 		_dialog->say(_res->_ingameTexts[kTextUnPocoRespeto]);
 		break;
 	case 264:
+	case 353:
 		// skip to root after the next one
 		_state->setCurrentRoot(room, rootIndex + 2, 0);
 		break;
@@ -411,11 +412,6 @@ void PelrockEngine::dialogActionTrigger(uint16 actionTrigger, byte room, byte ro
 		break;
 	}
 	case 349:
-		_state->setFlag(FLAG_MERCHANT_SLOGANS, _state->getFlag(FLAG_MERCHANT_SLOGANS) + 1);
-		if (_state->getFlag(FLAG_MERCHANT_SLOGANS) == 2) {
-			_state->setCurrentRoot(room, rootIndex + 1, 1);
-		}
-		break;
 	case 350:
 		_state->setFlag(FLAG_MERCHANT_SLOGANS, _state->getFlag(FLAG_MERCHANT_SLOGANS) + 1);
 		if (_state->getFlag(FLAG_MERCHANT_SLOGANS) == 2) {
@@ -443,9 +439,6 @@ void PelrockEngine::dialogActionTrigger(uint16 actionTrigger, byte room, byte ro
 		_dialog->say(_res->_ingameTexts[kTextMejorMeLargo], 1);
 		break;
 		// end merchants
-	case 353:
-		_state->setCurrentRoot(room, rootIndex + 2, 0);
-		break;
 	case 354:
 		if (_state->hasInventoryItem(105)) {
 			addInventoryItem(105);
diff --git a/engines/pelrock/menu.cpp b/engines/pelrock/menu.cpp
index 1624f5fc58f..28765a514bb 100644
--- a/engines/pelrock/menu.cpp
+++ b/engines/pelrock/menu.cpp
@@ -855,8 +855,6 @@ void MenuManager::drawButtons() {
 	case MAIN_MENU:
 		break;
 	case ORIGINAL_SAVE:
-		drawSaves();
-		break;
 	case ORIGINAL_LOAD:
 		drawSaves();
 		break;