[Scummvm-git-logs] scummvm branch-2-6 -> fbc6ae126b51ccca1eb90fe6449cc5094d4ca166

[antoniou79]

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

Summary:
399063d14e BLADERUNNER: CUTCONTENT: Move Grigorian's resources clue to cut content
fbc6ae126b BLADERUNNER: Gracefully handle a case for Grigorian's arrest


Commit: 399063d14e6a093639d31eaa5b5ced7e88489ca7
    https://github.com/scummvm/scummvm/commit/399063d14e6a093639d31eaa5b5ced7e88489ca7
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-07-19T23:06:04+03:00

Commit Message:
BLADERUNNER: CUTCONTENT: Move Grigorian's resources clue to cut content

Changed paths:
    engines/bladerunner/script/scene/ps09.cpp


diff --git a/engines/bladerunner/script/scene/ps09.cpp b/engines/bladerunner/script/scene/ps09.cpp
index 16f12920a1d..5cbf2a76c36 100644
--- a/engines/bladerunner/script/scene/ps09.cpp
+++ b/engines/bladerunner/script/scene/ps09.cpp
@@ -509,8 +509,10 @@ void SceneScriptPS09::dialogueWithGrigorian() {
 				//       in order to show up in the ESP version
 				Actor_Says_With_Pause(kActorGrigorian, 340, 0.0f, 14);
 			}
-			Actor_Clue_Acquire(kActorMcCoy, kClueGrigoriansResources, true, kActorGrigorian);
 #endif // BLADERUNNER_ORIGINAL_BUGS
+			if (_vm->_cutContent) {
+				Actor_Clue_Acquire(kActorMcCoy, kClueGrigoriansResources, true, kActorGrigorian);
+			}
 			Actor_Says(kActorMcCoy, 4375, 18);
 		}
 		break;


Commit: fbc6ae126b51ccca1eb90fe6449cc5094d4ca166
    https://github.com/scummvm/scummvm/commit/fbc6ae126b51ccca1eb90fe6449cc5094d4ca166
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-07-19T23:06:32+03:00

Commit Message:
BLADERUNNER: Gracefully handle a case for Grigorian's arrest

Addresses bug #13727 which only happens in vanilla mode, and only when CDFRAMESx files are used instead of a single HDFRAMES

This bug can happen since by (my) mistake the kClueGrigoriansResources clue could be acquired in vanilla mode in ScummVM 2.5.0, 2.5.1 and 2.6.0.
That clue is supposed to only be part of the restored content mode.

Changed paths:
    engines/bladerunner/script/scene/hf05.cpp


diff --git a/engines/bladerunner/script/scene/hf05.cpp b/engines/bladerunner/script/scene/hf05.cpp
index 48317a3757c..892d26304b8 100644
--- a/engines/bladerunner/script/scene/hf05.cpp
+++ b/engines/bladerunner/script/scene/hf05.cpp
@@ -486,6 +486,7 @@ void SceneScriptHF05::dialogueWithCrazylegs1() {
 		}
 		Actor_Says(kActorCrazylegs, 510, kAnimationModeTalk);
 		if (_vm->_cutContent) {
+			// TODO ASDF Test animation
 			Actor_Says(kActorCrazylegs, 520, kAnimationModeTalk);
 		}
 		Actor_Says(kActorMcCoy, 1920, 23);
@@ -622,7 +623,19 @@ void SceneScriptHF05::dialogueWithCrazylegs2() { // Restored feature - Original:
 	if (answer == 1250) { // ARREST
 		Actor_Says(kActorMcCoy, 1955, 17);
 		Actor_Says(kActorMcCoy, 1960, 23);
-		Item_Pickup_Spin_Effect(kModelAnimationSpinnerKeys, 315, 327);
+		if (_vm->_cutContent) {
+			// This extra check is required to fix a problematic saved game where
+			// the clue kClueGrigoriansResources was acquired in Vanilla Mode,
+			// due to a bug that affected ScummVM 2.5.0, 2.5.1 and 2.6.0.
+			// This bug only occurs if the game's data files contain
+			// separate CDFRAMESx.DAT files instead of a single HDFRAMES.DAT file.
+			// In Vanilla Mode the currently loaded CDFRAMES files
+			// is missing an animation (Bug #13727).
+			// In Restored Content mode we load all animation files
+			// so the bug, expectedly, does not manifest there.
+			// The animation for the keys item is the culprit.
+			Item_Pickup_Spin_Effect(kModelAnimationSpinnerKeys, 315, 327);
+		}
 		Delay(2000);
 		Actor_Says(kActorMcCoy, 1980, 23);
 		Actor_Says(kActorMcCoy, 1985, kAnimationModeTalk);