[Scummvm-git-logs] scummvm master -> 89bb1e5ce53a4a087e775dc81dab4ede40aedb8b

[yuv422]

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

Summary:
89bb1e5ce5 DARKSEED: Remove duplicate condition in expression. PVS-Studio V501


Commit: 89bb1e5ce53a4a087e775dc81dab4ede40aedb8b
    https://github.com/scummvm/scummvm/commit/89bb1e5ce53a4a087e775dc81dab4ede40aedb8b
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-10-15T08:34:20+11:00

Commit Message:
DARKSEED: Remove duplicate condition in expression. PVS-Studio V501

Changed paths:
    engines/darkseed/room.cpp


diff --git a/engines/darkseed/room.cpp b/engines/darkseed/room.cpp
index fca7b8a7629..d57c9dd1665 100644
--- a/engines/darkseed/room.cpp
+++ b/engines/darkseed/room.cpp
@@ -922,14 +922,14 @@ void Room::runRoomObjects() {
 						sprite._height,
 						false);
 				}
-			} else if (((((((_roomNumber == 6) || (_roomNumber == 5)) || (_roomNumber == 7)) ||
-						  ((_roomNumber == 32 || (_roomNumber == 26)))) ||
-						 ((_roomNumber == 64 || ((_roomNumber == 65 || (_roomNumber == 63)))))) ||
-						(_roomNumber == 66)) ||
-					   (((((((_roomNumber == 67 || (_roomNumber == 28)) || (_roomNumber == 37)) ||
-							((_roomNumber == 39 || (_roomNumber == 32)))) || (_roomNumber == 57)) ||
-						  ((_roomNumber == 60 || (_roomNumber == 44)))) ||
-						 ((_roomNumber == 57 || ((_roomNumber == 38 || (_roomNumber == 25)))))))) {
+			} else if (_roomNumber == 6 || _roomNumber == 5 || _roomNumber == 7 ||
+					   _roomNumber == 32 || _roomNumber == 26 ||
+					   _roomNumber == 64 || _roomNumber == 65 || _roomNumber == 63 ||
+					   _roomNumber == 66 ||
+					   _roomNumber == 67 || _roomNumber == 28 || _roomNumber == 37 ||
+					   _roomNumber == 39 || _roomNumber == 32 || _roomNumber == 57 ||
+					   _roomNumber == 60 || _roomNumber == 44 ||
+					   _roomNumber == 38 || _roomNumber == 25) {
 				const Sprite &sprite = _locationSprites.getSpriteAt(spriteNum);
 				int playerLeftXPos = g_engine->_player->_position.x - g_engine->_player->getWidth() / 2;
 				int playerRightXPos = g_engine->_player->_position.x + g_engine->_player->getWidth() / 2;