[Scummvm-git-logs] scummvm master -> 8199c96342e2f1d7d2fd50a397db7ca8e1bfa617

[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:
c3ca6b5a96 BLADERUNNER: Add a few more lines to debug info output
8199c96342 BLADERUNNER: Fix remnant clickable and target spot in NR11


Commit: c3ca6b5a9694cfa841d6b267c4eb53967380ece2
    https://github.com/scummvm/scummvm/commit/c3ca6b5a9694cfa841d6b267c4eb53967380ece2
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-07-27T23:01:02+03:00

Commit Message:
BLADERUNNER: Add a few more lines to debug info output

For clue count, crime count and suspect count

Changed paths:
    engines/bladerunner/game_info.cpp


diff --git a/engines/bladerunner/game_info.cpp b/engines/bladerunner/game_info.cpp
index e610dc96fa..ea62bd965e 100644
--- a/engines/bladerunner/game_info.cpp
+++ b/engines/bladerunner/game_info.cpp
@@ -123,6 +123,10 @@ bool GameInfo::open(const Common::String &name) {
 	for (uint32 i = 0; i != _outtakeCount; ++i) {
 		debug("%2d: %s.VQA", i, _outtakes[i].c_str());
 	}
+
+	debug("Clue Count: %d ", _clueCount);
+	debug("Crime Count: %d ", _crimeCount);
+	debug("Suspect Count: %d ", _suspectCount);
 #endif
 
 	bool err = s->err();


Commit: 8199c96342e2f1d7d2fd50a397db7ca8e1bfa617
    https://github.com/scummvm/scummvm/commit/8199c96342e2f1d7d2fd50a397db7ca8e1bfa617
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-07-27T23:01:02+03:00

Commit Message:
BLADERUNNER: Fix remnant clickable and target spot in NR11

For the case when McCoy allows Dektora to leave.

Also RESTORED CONTENT: a small extra dialogue with McCoy telling Dektora to call him Ray.

Changed paths:
    engines/bladerunner/game_constants.h
    engines/bladerunner/script/ai/dektora.cpp
    engines/bladerunner/script/scene/nr11.cpp


diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 039dd22e50..69115bb1b9 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -2979,6 +2979,7 @@ enum GoalDektora {
 	kGoalDektoraNR11BurningFallToNR10        = 279,
 	kGoalDektoraNR11RanAway                  = 290,
 	kGoalDektoraNR07RanAway                  = 295,
+	kGoalDektoraStartAct4StashedAway         = 300,
 	kGoalDektoraKP07Wait                     = 513, // new goal when in moonbus, Act 5
 	kGoalDektoraGone                         = 599
 };
diff --git a/engines/bladerunner/script/ai/dektora.cpp b/engines/bladerunner/script/ai/dektora.cpp
index f4d02b117b..d863cd298b 100644
--- a/engines/bladerunner/script/ai/dektora.cpp
+++ b/engines/bladerunner/script/ai/dektora.cpp
@@ -118,8 +118,8 @@ bool AIScriptDektora::Update() {
 	}
 
 	if (chapter == 4) {
-		if (Actor_Query_Goal_Number(kActorDektora) < 300) {
-			Actor_Set_Goal_Number(kActorDektora, 300);
+		if (Actor_Query_Goal_Number(kActorDektora) < kGoalDektoraStartAct4StashedAway) {
+			Actor_Set_Goal_Number(kActorDektora, kGoalDektoraStartAct4StashedAway);
 		}
 		return true;
 	}
@@ -575,6 +575,11 @@ bool AIScriptDektora::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 
 	case kGoalDektoraNR11RanAway:
 		Game_Flag_Set(kFlagDektoraRanAway);
+#if !BLADERUNNER_ORIGINAL_BUGS
+		// This will teleport Dektora out of the NR11 scene
+		// and remove the awry target hotspot at the region where she left
+		Actor_Set_Goal_Number(kActorDektora, kGoalDektoraStartAct4StashedAway);
+#endif // !BLADERUNNER_ORIGINAL_BUGS
 		break;
 
 	case 299:
@@ -583,10 +588,10 @@ bool AIScriptDektora::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Actor_Set_Goal_Number(kActorDektora, kGoalDektoraGone);
 		break;
 
-	case 300:
+	case kGoalDektoraStartAct4StashedAway:
 		AI_Movement_Track_Flush(kActorDektora);
 		Actor_Put_In_Set(kActorDektora, kSetFreeSlotA);
-		Actor_Set_At_Waypoint(kActorDektora, 33, 0);
+		Actor_Set_At_Waypoint(kActorDektora, 33, 0); // in kSetFreeSlotA
 		break;
 
 	default:
diff --git a/engines/bladerunner/script/scene/nr11.cpp b/engines/bladerunner/script/scene/nr11.cpp
index 71d5475c3c..dc14ef88d9 100644
--- a/engines/bladerunner/script/scene/nr11.cpp
+++ b/engines/bladerunner/script/scene/nr11.cpp
@@ -217,9 +217,30 @@ bool SceneScriptNR11::ClickedOn3DObject(const char *objectName, bool combatMode)
 					}
 					Actor_Says(kActorDektora, 1080, 13);
 					Actor_Says(kActorMcCoy, 3875, 14);
-					Actor_Says(kActorDektora, 1090, 17);
+					Actor_Says(kActorDektora, 1090, 17);     // I... appreciate it, Mr. McCoy.
+					if (_vm->_cutContent
+					 && Global_Variable_Query(kVariableAffectionTowards) == kAffectionTowardsDektora) {
+						Actor_Says(kActorMcCoy, 3880, -1);   // Call me Ray.
+						Actor_Says(kActorDektora, 1100, 12); // Okay. Ray.
+					}
 					Music_Stop(4u);
 					Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR11WalkAway);
+#if !BLADERUNNER_ORIGINAL_BUGS
+					Unclickable_Object("CLOTHING02");
+					Unclickable_Object("BOX27");
+					Unclickable_Object("BOX39");
+					Unclickable_Object("DRESS");
+					Unclickable_Object("COATRACK");
+					Unclickable_Object("COLUMN3 DETS");
+					Unclickable_Object("COLUMN PIPE01");
+					Unclickable_Object("RECTANGLE02");
+					Unclickable_Object("COLUMN04");
+					Unclickable_Object("COATRACK01");
+					Unclickable_Object("SHIRT");
+					Unclickable_Object("SKIRT 02");
+					Unclickable_Object("CLOTHING B 03");
+					Unclickable_Object("BUST BUST");
+#endif // !BLADERUNNER_ORIGINAL_BUGS
 					if (Global_Variable_Query(kVariableHollowayArrest) == 1) {
 						Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR10Wait);
 					}