[Scummvm-git-logs] scummvm master -> 257d0f79de44693c7595a948cd41b141cc7b1e18

[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:
6d79769258 BLADERUNNER: RESTOREDCONTENT: Correct heading for Crazylegs in PS09
257d0f79de BLADERUNNER: RESTOREDCONTENT: Better hotspot for spinner in HF01


Commit: 6d797692589bd890b9c52b5fd69c01e0f11e0d5f
    https://github.com/scummvm/scummvm/commit/6d797692589bd890b9c52b5fd69c01e0f11e0d5f
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-06-27T18:59:02+03:00

Commit Message:
BLADERUNNER: RESTOREDCONTENT: Correct heading for Crazylegs in PS09

Also fix Crazylegs reacting to McCoy drawing his gun in PS09

Changed paths:
    engines/bladerunner/script/ai/crazylegs.cpp
    engines/bladerunner/script/scene/hf05.cpp
    engines/bladerunner/script/scene/ps09.cpp


diff --git a/engines/bladerunner/script/ai/crazylegs.cpp b/engines/bladerunner/script/ai/crazylegs.cpp
index aa33abf888..c6a3d3eb21 100644
--- a/engines/bladerunner/script/ai/crazylegs.cpp
+++ b/engines/bladerunner/script/ai/crazylegs.cpp
@@ -86,7 +86,8 @@ void AIScriptCrazylegs::OtherAgentExitedThisSet(int otherActorId) {
 
 void AIScriptCrazylegs::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
 	if (Actor_Query_Goal_Number(kActorCrazylegs) != kGoalCrazyLegsLeavesShowroom && otherActorId == kActorMcCoy) {
-		if (combatMode && Global_Variable_Query(kVariableChapter) < 5) {
+		if (combatMode && Global_Variable_Query(kVariableChapter) < 5
+		    && (!_vm->_cutContent || Actor_Query_In_Set(kActorCrazylegs, kSetHF05))) {
 			Actor_Face_Actor(kActorCrazylegs, kActorMcCoy, true);
 			Actor_Face_Actor(kActorMcCoy, kActorCrazylegs, true);
 			Actor_Says(kActorCrazylegs, 430, 3);
diff --git a/engines/bladerunner/script/scene/hf05.cpp b/engines/bladerunner/script/scene/hf05.cpp
index 46d3174a36..3a3221f621 100644
--- a/engines/bladerunner/script/scene/hf05.cpp
+++ b/engines/bladerunner/script/scene/hf05.cpp
@@ -607,6 +607,8 @@ void SceneScriptHF05::dialogueWithCrazylegs2() { // cut feature? it is impossibl
 		Actor_Says(kActorMcCoy, 1995, kAnimationModeTalk);
 		Game_Flag_Set(kFlagCrazylegsArrested);
 		Actor_Put_In_Set(kActorCrazylegs, kSetPS09);
+		// This XYZ is awry (won't show Crazylegs inside a cell or at all in the PS09 scene)
+		// but it is eventually overridden by the PS09 script, which puts Crazylegs at the right spot
 		Actor_Set_At_XYZ(kActorCrazylegs, -315.15f, 0.0f, 241.06f, 583);
 		Actor_Set_Goal_Number(kActorCrazylegs, kGoalCrazyLegsIsArrested);
 		Game_Flag_Set(kFlagCrazylegsArrestedTalk);
diff --git a/engines/bladerunner/script/scene/ps09.cpp b/engines/bladerunner/script/scene/ps09.cpp
index c1852a7a0a..46792c2373 100644
--- a/engines/bladerunner/script/scene/ps09.cpp
+++ b/engines/bladerunner/script/scene/ps09.cpp
@@ -56,7 +56,12 @@ void SceneScriptPS09::InitializeScene() {
 	}
 	if (Game_Flag_Query(kFlagCrazylegsArrested)) { // cut feature? it is impossible to arrest crazylegs
 		Actor_Put_In_Set(kActorCrazylegs, kSetPS09);
+#if BLADERUNNER_ORIGINAL_BUGS
 		Actor_Set_At_XYZ(kActorCrazylegs, -290.0f, 0.33f, -235.0f, 207);
+#else
+		// Correct orientation for CrazyLegs
+		Actor_Set_At_XYZ(kActorCrazylegs, -290.0f, 0.33f, -235.0f, 583);
+#endif
 	}
 }
 
@@ -200,8 +205,14 @@ bool SceneScriptPS09::ClickedOnActor(int actorId) {
 				Actor_Face_Actor(kActorMcCoy, kActorGrigorian, true);
 				Actor_Says(kActorMcCoy, 4435, 14);
 				Actor_Says(kActorGrigorian, 430, 16);
+#if !BLADERUNNER_ORIGINAL_BUGS
+				Actor_Face_Heading(kActorGrigorian, 512, true);
+#endif
 				Actor_Says(kActorCrazylegs, 1130, kAnimationModeTalk);
 				Game_Flag_Set(kFlagPS09CrazylegsGrigorianTalk);
+#if !BLADERUNNER_ORIGINAL_BUGS
+				Actor_Face_Actor(kActorCrazylegs, kActorMcCoy, true);
+#endif
 				return true;
 			}
 


Commit: 257d0f79de44693c7595a948cd41b141cc7b1e18
    https://github.com/scummvm/scummvm/commit/257d0f79de44693c7595a948cd41b141cc7b1e18
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-06-27T18:59:02+03:00

Commit Message:
BLADERUNNER: RESTOREDCONTENT: Better hotspot for spinner in HF01

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


diff --git a/engines/bladerunner/script/scene/hf01.cpp b/engines/bladerunner/script/scene/hf01.cpp
index be3038590e..32fe99c168 100644
--- a/engines/bladerunner/script/scene/hf01.cpp
+++ b/engines/bladerunner/script/scene/hf01.cpp
@@ -51,6 +51,11 @@ void SceneScriptHF01::InitializeScene() {
 		Scene_Exit_Add_2D_Exit(2, 560, 231, 639, 360, 0);
 		if (Game_Flag_Query(kFlagSpinnerAtHF01)) {
 			Scene_Exit_Add_2D_Exit(3, 0, 311, 66, 417, 2);
+			if (_vm->_cutContent) {
+				// improve hotspot for Spinner in HF01
+				Scene_Exit_Add_2D_Exit(4,  66, 335, 140, 410, 2);
+				Scene_Exit_Add_2D_Exit(5, 140, 350, 230, 390, 2);
+			}
 		}
 	}
 
@@ -210,7 +215,8 @@ bool SceneScriptHF01::ClickedOnExit(int exitId) {
 		return true;
 	}
 
-	if (exitId == 3) {
+	if (exitId == 3
+	    || (_vm->_cutContent && (exitId == 4 || exitId == 5))) {
 		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 100.0f, 0.0f, -260.0f, 0, true, false, false)) {
 			Game_Flag_Reset(kFlagMcCoyInChinaTown);
 			Game_Flag_Reset(kFlagMcCoyInRunciters);