[Scummvm-git-logs] scummvm master -> 9efcf016a69c2d3eca52616f921a3b8cdae179ce

[antoniou79]

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:
9efcf016a6 BLADERUNNER: CUTCONTENT: Restore comment on monitors in TB05


Commit: 9efcf016a69c2d3eca52616f921a3b8cdae179ce
    https://github.com/scummvm/scummvm/commit/9efcf016a69c2d3eca52616f921a3b8cdae179ce
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2020-11-30T23:37:33+02:00

Commit Message:
BLADERUNNER: CUTCONTENT: Restore comment on monitors in TB05

Changed paths:
    engines/bladerunner/game_constants.h
    engines/bladerunner/script/scene/bb11.cpp
    engines/bladerunner/script/scene/tb05.cpp


diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index a540bb79af..9bc4643990 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -504,7 +504,7 @@ enum Flags {
 	kFlagMA04toMA05                           =  62,
 	kFlagMA05toMA04                           =  63,
 	kFlagGaffApproachedMcCoyAboutZuben        =  64,
-	// 65 is never used
+	kFlagMcCoyCommentsOnTB05Monitors          =  65, // Re-purposed. Original: 65 is never used
 	// 66 is never used
 	// 67 is never used
 	kFlagCT02toCT01                           =  68,
diff --git a/engines/bladerunner/script/scene/bb11.cpp b/engines/bladerunner/script/scene/bb11.cpp
index 381b03d103..edf7046b84 100644
--- a/engines/bladerunner/script/scene/bb11.cpp
+++ b/engines/bladerunner/script/scene/bb11.cpp
@@ -104,6 +104,7 @@ bool SceneScriptBB11::ClickedOn2DRegion(int region) {
 	if (_vm->_cutContent) {
 		if (!Game_Flag_Query(kFlagMcCoyCommentsOnFans) && (region == 0 || region == 1) ) {
 			Game_Flag_Set(kFlagMcCoyCommentsOnFans);
+			Actor_Force_Stop_Walking(kActorMcCoy);
 			Actor_Face_Heading(kActorMcCoy, 550, false);
 			Actor_Voice_Over(3740, kActorVoiceOver);
 			Actor_Voice_Over(3750, kActorVoiceOver);
diff --git a/engines/bladerunner/script/scene/tb05.cpp b/engines/bladerunner/script/scene/tb05.cpp
index 23130f3fd9..70f61ddd5b 100644
--- a/engines/bladerunner/script/scene/tb05.cpp
+++ b/engines/bladerunner/script/scene/tb05.cpp
@@ -34,6 +34,13 @@ void SceneScriptTB05::InitializeScene() {
 	}
 	Scene_Exit_Add_2D_Exit(0, 62, 193, 206, 419, 0);
 	Scene_Exit_Add_2D_Exit(1,  0, 455, 639, 479, 2);
+	if (_vm->_cutContent
+	    && Game_Flag_Query(kFlagTB05MonitorIntro)
+	    && !Game_Flag_Query(kFlagMcCoyCommentsOnTB05Monitors)) {
+		// in order not to confuse the player (much) with a red herring region,
+		// we enable this region *after* the player has accessed the correct pc / panel
+		Scene_2D_Region_Add(0, 382, 255, 634, 325); // monitors and panels other than the "main monitor"
+	}
 	Ambient_Sounds_Add_Looping_Sound(kSfxTB5LOOP1, 100, 0, 1);
 	Ambient_Sounds_Add_Looping_Sound(kSfxTB5LOOP2, 100, 0, 1);
 	Ambient_Sounds_Add_Sound(kSfxHUMMER1,  5, 30, 25, 33, -100, 100, -101, -101, 0, 0);
@@ -81,6 +88,11 @@ bool SceneScriptTB05::ClickedOn3DObject(const char *objectName, bool a2) {
 				Actor_Voice_Over(2190, kActorVoiceOver);
 				Actor_Voice_Over(2200, kActorVoiceOver);
 				Game_Flag_Set(kFlagTB05MonitorIntro);
+				if (_vm->_cutContent) {
+					// in order not to confuse the player (much) with a red herring region,
+					// we enable this region *after* the player has accessed the correct pc / panel
+					Scene_2D_Region_Add(0, 382, 255, 634, 325); // monitors and panels other than the "main monitor"
+				}
 				return true;
 			}
 
@@ -192,6 +204,17 @@ bool SceneScriptTB05::ClickedOnExit(int exitId) {
 }
 
 bool SceneScriptTB05::ClickedOn2DRegion(int region) {
+	if (_vm->_cutContent) {
+		if (!Game_Flag_Query(kFlagMcCoyCommentsOnTB05Monitors) && region == 0) {
+			Game_Flag_Set(kFlagMcCoyCommentsOnTB05Monitors);
+			Actor_Force_Stop_Walking(kActorMcCoy);
+			Actor_Face_Heading(kActorMcCoy, 64, false);
+			Actor_Voice_Over(2210, kActorVoiceOver);
+			Actor_Voice_Over(2220, kActorVoiceOver);
+			Scene_2D_Region_Remove(0);
+			return true;
+		}
+	}
 	return false;
 }