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

[sluicebox]

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:
b3a522914f SCI: Cleanup Script::initializeObjects version checks


Commit: b3a522914f8baf516a28ee64e40a19b0f9733c1a
    https://github.com/scummvm/scummvm/commit/b3a522914f8baf516a28ee64e40a19b0f9733c1a
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-04-13T14:55:08-07:00

Commit Message:
SCI: Cleanup Script::initializeObjects version checks

Coverity issue 1498711

Changed paths:
    engines/sci/engine/script.cpp


diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index a10ba8df074..c657c1f0958 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -1225,10 +1225,10 @@ void Script::initializeObjectsSci3(SegManager *segMan, SegmentId segmentId, bool
 void Script::initializeObjects(SegManager *segMan, SegmentId segmentId, bool applyScriptPatches) {
 	if (getSciVersion() <= SCI_VERSION_1_LATE)
 		initializeObjectsSci0(segMan, segmentId, applyScriptPatches);
-	else if (getSciVersion() >= SCI_VERSION_1_1 && getSciVersion() <= SCI_VERSION_2_1_LATE)
+	else if (getSciVersion() <= SCI_VERSION_2_1_LATE)
 		initializeObjectsSci11(segMan, segmentId, applyScriptPatches);
 #ifdef ENABLE_SCI32
-	else if (getSciVersion() == SCI_VERSION_3)
+	else
 		initializeObjectsSci3(segMan, segmentId, applyScriptPatches);
 #endif
 }