[Scummvm-git-logs] scummvm master -> 60ae1f76ef4b20cf613d6d79bbad4d62fe5b53d2

[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:
60ae1f76ef PELROCK: Remove redundant conditions. PVS-Studio V560


Commit: 60ae1f76ef4b20cf613d6d79bbad4d62fe5b53d2
    https://github.com/scummvm/scummvm/commit/60ae1f76ef4b20cf613d6d79bbad4d62fe5b53d2
Author: kelmer (kelmer at gmail.com)
Date: 2026-05-26T16:11:24+02:00

Commit Message:
PELROCK: Remove redundant conditions. PVS-Studio V560

Changed paths:
    engines/pelrock/room.cpp
    engines/pelrock/slidingpuzzle.cpp


diff --git a/engines/pelrock/room.cpp b/engines/pelrock/room.cpp
index 6e8ee799299..894e325a14c 100644
--- a/engines/pelrock/room.cpp
+++ b/engines/pelrock/room.cpp
@@ -613,7 +613,7 @@ void RoomManager::resetConversationStates(byte roomNumber, byte *conversationDat
 		return;
 	}
 	bool roomDone = false;
-	while (!alfredB.eos() && !roomDone) {
+	while (!alfredB.eos()) {
 		ResetEntry entry;
 		entry.room = alfredB.readUint16LE();
 		entry.offset = alfredB.readUint16LE();
@@ -1158,7 +1158,7 @@ void RoomManager::resetMetadataDefaults(byte room, byte *&data, size_t size) {
 		error("RoomManager::resetMetadataDefaults(): Couldnt find file ALFRED.8");
 	}
 	bool roomDone = false;
-	while (!alfred8.eos() && !roomDone) {
+	while (!alfred8.eos()) {
 		ResetEntry entry;
 		entry.room = alfred8.readUint16LE();
 		entry.offset = alfred8.readUint16LE();
diff --git a/engines/pelrock/slidingpuzzle.cpp b/engines/pelrock/slidingpuzzle.cpp
index e2625962127..0e0b0ab8d57 100644
--- a/engines/pelrock/slidingpuzzle.cpp
+++ b/engines/pelrock/slidingpuzzle.cpp
@@ -207,7 +207,7 @@ void SlidingPuzzle::puzzleLoop() {
 		}
 
 		// While any key is held, show the original (unscrambled) background.
-		if (_events->_isKeydown && _events->_lastKeyEvent != Common::KEYCODE_ESCAPE) {
+		if (_events->_isKeydown) {
 			showOriginalImage();
 		}
 		_events->_lastKeyEvent = Common::KEYCODE_INVALID;