BLADERUNNER: Restore Gordo's lighter (Rep) comment

8 files changed, 24 insertions, 11 deletions

diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 12f33b70b3..5b7877fb1f 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -123,7 +123,7 @@ enum Clues {
 	kClueCrowdInterviewB = 17,
 	kClueZubenRunsAway = 18,
 	kClueZubenInterview = 19,
-	kClueZuben = 20,
+	kClueZubenSquadPhoto = 20,
 	kClueBigManLimping = 21,
 	kClueRunciterInterviewA = 22,
 	kClueRunciterInterviewB1 = 23,
diff --git a/engines/bladerunner/script/ai/gaff.cpp b/engines/bladerunner/script/ai/gaff.cpp
index ac9d944228..dbe6899a65 100644
--- a/engines/bladerunner/script/ai/gaff.cpp
+++ b/engines/bladerunner/script/ai/gaff.cpp
@@ -94,7 +94,7 @@ void AIScriptGaff::CompletedMovementTrack() {
 		Actor_Says(kActorGaff, 40, kAnimationModeTalk);
 		Actor_Says(kActorMcCoy, 690, kAnimationModeTalk);
 		Actor_Clue_Acquire(kActorMcCoy, kClueGaffsInformation, true, kActorGaff);
-		CDB_Set_Crime(kClueZuben, kCrimeMoonbusHijacking);
+		CDB_Set_Crime(kClueZubenSquadPhoto, kCrimeMoonbusHijacking);
 		Actor_Clue_Acquire(kActorGaff, kClueMcCoyRetiredZuben, true, -1);
 		Game_Flag_Set(kFlagGaffApproachedMcCoyAboutZuben);
 		Player_Gains_Control();
diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp
index 11afe3e532..2ebac44f6c 100644
--- a/engines/bladerunner/script/ai/gordo.cpp
+++ b/engines/bladerunner/script/ai/gordo.cpp
@@ -1700,7 +1700,7 @@ void AIScriptGordo::dialogue2() {
 	} else if (answer == 830) { // LET GO
 		Actor_Says(kActorMcCoy, 3100, 16);
 		Actor_Says(kActorGordo, 240, 14);
-		if (Actor_Clue_Query(0, 102)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueStolenCheese)) {
 			Actor_Says(kActorMcCoy, 3105, 15);
 			Actor_Says(kActorMcCoy, 3110, 17);
 			Actor_Says(kActorGordo, 250, 13);
diff --git a/engines/bladerunner/script/ai/mccoy.cpp b/engines/bladerunner/script/ai/mccoy.cpp
index 070c3f200b..e39d0f8fd5 100644
--- a/engines/bladerunner/script/ai/mccoy.cpp
+++ b/engines/bladerunner/script/ai/mccoy.cpp
@@ -246,10 +246,12 @@ void AIScriptMcCoy::ReceivedClue(int clueId, int fromActorId) {
 		Actor_Clue_Acquire(kActorMcCoy, kClueGuzzaFramedMcCoy, true, -1);
 
 		if (clueId == kClueFolder) {
+			// if McCoy just got the folder
 			Actor_Voice_Over(2780, kActorVoiceOver);
 			Actor_Voice_Over(2800, kActorVoiceOver);
 			Actor_Voice_Over(2810, kActorVoiceOver);
 		} else if (Actor_Clue_Query(kActorMcCoy, kClueFolder)) {
+			// if McCoy already had the folder
 			Actor_Voice_Over(3430, kActorVoiceOver);
 			Actor_Voice_Over(3440, kActorVoiceOver);
 			Actor_Voice_Over(3450, kActorVoiceOver);
@@ -259,6 +261,7 @@ void AIScriptMcCoy::ReceivedClue(int clueId, int fromActorId) {
 			Actor_Voice_Over(3490, kActorVoiceOver);
 			Actor_Voice_Over(3500, kActorVoiceOver);
 		} else {
+			// if McCoy never got the folder
 			Actor_Voice_Over(3510, kActorVoiceOver);
 			Actor_Voice_Over(3520, kActorVoiceOver);
 			Actor_Voice_Over(3530, kActorVoiceOver);
diff --git a/engines/bladerunner/script/init_script.cpp b/engines/bladerunner/script/init_script.cpp
index 32ad965e31..db31ef6176 100644
--- a/engines/bladerunner/script/init_script.cpp
+++ b/engines/bladerunner/script/init_script.cpp
@@ -2288,7 +2288,7 @@ void InitScript::Init_SDB() {
 	}
 	SDB_Add_Replicant_Clue(kSuspectZuben, kClueHowieLeeInterview);
 	SDB_Add_Replicant_Clue(kSuspectZuben, kClueZubenRunsAway);
-	SDB_Add_Replicant_Clue(kSuspectZuben, kClueZuben);
+	SDB_Add_Replicant_Clue(kSuspectZuben, kClueZubenSquadPhoto);
 	SDB_Add_Replicant_Clue(kSuspectZuben, kClueZubenTalksAboutLucy1);
 	SDB_Add_Replicant_Clue(kSuspectZuben, kClueZubenTalksAboutLucy2);
 	SDB_Add_Non_Replicant_Clue(kSuspectZuben, kClueLimpingFootprints);
@@ -2301,7 +2301,7 @@ void InitScript::Init_SDB() {
 	SDB_Add_Identity_Clue(kSuspectZuben, kClueZubenRunsAway);
 	SDB_Add_Identity_Clue(kSuspectZuben, kClueZubenInterview);
 	SDB_Add_Identity_Clue(kSuspectZuben, kClueLucyInterview);
-	SDB_Add_Photo_Clue(kSuspectZuben, kClueZuben, 33);
+	SDB_Add_Photo_Clue(kSuspectZuben, kClueZubenSquadPhoto, 33);
 
 	SDB_Set_Actor(kSuspectLucy, kActorLucy);
 	SDB_Set_Sex(kSuspectLucy, 0);
@@ -2436,7 +2436,7 @@ void InitScript::Init_CDB() {
 	CDB_Set_Crime(kClueZubenInterview, kCrimeAnimalMurder);
 	CDB_Set_Crime(kClueLucy, kCrimeAnimalMurder);
 	CDB_Set_Crime(kClueDragonflyAnklet, kCrimeAnimalMurder);
-	CDB_Set_Crime(kClueZuben, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueZubenSquadPhoto, kCrimeAnimalMurder);
 
 	CDB_Set_Crime(kCluePhoneCallGuzza, kCrimeEisendullerMurder);
 	CDB_Set_Crime(kClueDragonflyEarring, kCrimeEisendullerMurder);
@@ -2514,7 +2514,7 @@ void InitScript::Init_CDB() {
 	CDB_Set_Clue_Asset_Type(kClueCrowdInterviewA, kClueTypeAudioRecording);
 	CDB_Set_Clue_Asset_Type(kClueCrowdInterviewB, kClueTypeAudioRecording);
 	CDB_Set_Clue_Asset_Type(kClueZubenInterview, kClueTypeAudioRecording);
-	CDB_Set_Clue_Asset_Type(kClueZuben, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueZubenSquadPhoto, kClueTypePhotograph);
 	CDB_Set_Clue_Asset_Type(kClueBigManLimping, kClueTypeAudioRecording);
 	CDB_Set_Clue_Asset_Type(kClueRunciterInterviewA, kClueTypeAudioRecording);
 	CDB_Set_Clue_Asset_Type(kClueRunciterInterviewB1, kClueTypeAudioRecording);
diff --git a/engines/bladerunner/script/kia_script.cpp b/engines/bladerunner/script/kia_script.cpp
index 4475e8646f..961e86c952 100644
--- a/engines/bladerunner/script/kia_script.cpp
+++ b/engines/bladerunner/script/kia_script.cpp
@@ -121,7 +121,7 @@ void KIAScript::SCRIPT_KIA_DLL_Play_Clue_Asset_Script(int notUsed, int clueId) {
 		KIA_Play_Actor_Dialogue(kActorMcCoy, 410);
 		KIA_Play_Actor_Dialogue(kActorZuben, 50);
 		break;
-	case kClueZuben:
+	case kClueZubenSquadPhoto:
 		KIA_Play_Photograph(33);
 		KIA_Play_Actor_Dialogue(kActorVoiceOver, 350);
 		break;
@@ -489,7 +489,17 @@ void KIAScript::SCRIPT_KIA_DLL_Play_Clue_Asset_Script(int notUsed, int clueId) {
 		break;
 	case kClueGordosLighterReplicant:
 		KIA_Play_Slice_Model(kModelAnimationGordosLighterReplicant);
-		KIA_Play_Actor_Dialogue(kActorVoiceOver, 350);
+		if (_vm->_cutContent) {
+			if (Actor_Clue_Query(kActorMcCoy, kClueZubenSquadPhoto)) {
+				KIA_Play_Actor_Dialogue(kActorVoiceOver, 1450);
+			} else {
+				KIA_Play_Actor_Dialogue(kActorVoiceOver, 350);
+			}
+			KIA_Play_Actor_Dialogue(kActorVoiceOver, 1460);
+			KIA_Play_Actor_Dialogue(kActorVoiceOver, 1470);
+		} else {
+			KIA_Play_Actor_Dialogue(kActorVoiceOver, 350);
+		}
 		break;
 	case kClueGordosLighterHuman:
 		KIA_Play_Slice_Model(kModelAnimationGordosLighterHuman);
diff --git a/engines/bladerunner/script/scene/ct06.cpp b/engines/bladerunner/script/scene/ct06.cpp
index bed2b59e54..1aab6c585a 100644
--- a/engines/bladerunner/script/scene/ct06.cpp
+++ b/engines/bladerunner/script/scene/ct06.cpp
@@ -91,7 +91,7 @@ bool SceneScriptCT06::ClickedOnActor(int actorId) {
 		Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorZuben, 24, true, false);
 		Actor_Face_Actor(kActorMcCoy, kActorZuben, true);
 		if (!Game_Flag_Query(kFlagCT06ZubenPhoto)) {
-			Actor_Clue_Acquire(kActorMcCoy, kClueZuben, true, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueZubenSquadPhoto, true, -1);
 			Item_Pickup_Spin_Effect(kModelAnimationPhoto, 340, 369);
 			Actor_Voice_Over(350, kActorVoiceOver);
 			Actor_Voice_Over(360, kActorVoiceOver);
diff --git a/engines/bladerunner/script/scene/ct12.cpp b/engines/bladerunner/script/scene/ct12.cpp
index 8cd5210e91..e4abbcbcd3 100644
--- a/engines/bladerunner/script/scene/ct12.cpp
+++ b/engines/bladerunner/script/scene/ct12.cpp
@@ -287,7 +287,7 @@ void SceneScriptCT12::PlayerWalkedIn() {
 		Actor_Says(kActorMcCoy, 690, kAnimationModeTalk);
 		Actor_Clue_Acquire(kActorMcCoy, kClueGaffsInformation, true, kActorGaff);
 		Game_Flag_Set(kFlagGaffApproachedMcCoyAboutZuben);
-		CDB_Set_Crime(kClueZuben, kCrimeMoonbusHijacking);
+		CDB_Set_Crime(kClueZubenSquadPhoto, kCrimeMoonbusHijacking);
 
 		if (Game_Flag_Query(kFlagGaffApproachedMcCoyAboutZuben)
 		 && Game_Flag_Query(kFlagZubenRetired)