[Scummvm-git-logs] scummvm master -> 00c7e30aec534e3fb0da7b646179848b489e3e17

[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:
00c7e30aec BLADERUNNER: CUTCONTENT: Move lighter voiceover to KIA


Commit: 00c7e30aec534e3fb0da7b646179848b489e3e17
    https://github.com/scummvm/scummvm/commit/00c7e30aec534e3fb0da7b646179848b489e3e17
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-01-27T12:15:29+02:00

Commit Message:
BLADERUNNER: CUTCONTENT: Move lighter voiceover to KIA

This is done to avoid overlap with Gordo's performance which may be starting or have started at that time

Changed paths:
    engines/bladerunner/script/kia_script.cpp
    engines/bladerunner/script/scene/nr02.cpp


diff --git a/engines/bladerunner/script/kia_script.cpp b/engines/bladerunner/script/kia_script.cpp
index f470cc69320..cbfa89c8b46 100644
--- a/engines/bladerunner/script/kia_script.cpp
+++ b/engines/bladerunner/script/kia_script.cpp
@@ -521,7 +521,33 @@ 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) {
+			// Indicates Gordo is a Replicant.
+			if (Actor_Clue_Query(kActorMcCoy, kClueZubenSquadPhoto)
+				&& (Global_Variable_Query(kVariableChapter) == 2 || Global_Variable_Query(kVariableChapter) == 3)) {
+				// NOTE this is only in TLK02
+				// so it should be for Act 2 and 3 only (The lighter is normally spawned in Act 3)
+				// NOTE 2 As of yet, we load all TLK resources in cut content mode (see Chapters::enterChapter()),
+				// so the check for specific chapters is redundantly restrictive here.
+				// TODO maybe we can remove it, if we're not concerned about minimum resource usage in cut content mode
+				KIA_Play_Actor_Dialogue(kActorVoiceOver, 1450);
+			} else {
+				// TLK0A
+				// Re-use quote from Zuben's death (picking up his photo from the Rep Squad)
+				KIA_Play_Actor_Dialogue(kActorVoiceOver, 350);
+			}
+			// NOTE this is only in TLK02
+			// so it should be for Act 2 and 3 only (The lighter is normally spawned in Act 3)
+			// NOTE 2 As of yet, we load all TLK resources in cut content mode (see Chapters::enterChapter()),
+			// so the check for specific chapters is redundantly restrictive here.
+			// TODO maybe we can remove it, if we're not concerned about minimum resource usage in cut content mode
+			if (Global_Variable_Query(kVariableChapter) == 2 || Global_Variable_Query(kVariableChapter) == 3) {
+				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/nr02.cpp b/engines/bladerunner/script/scene/nr02.cpp
index e618fb338d0..56db49ac76f 100644
--- a/engines/bladerunner/script/scene/nr02.cpp
+++ b/engines/bladerunner/script/scene/nr02.cpp
@@ -121,33 +121,9 @@ bool SceneScriptNR02::ClickedOnItem(int itemId, bool a2) {
 			Actor_Face_Heading(kActorMcCoy, 423, false);
 			if (itemId == kItemGordosLighterReplicant) {
 				Item_Remove_From_World(kItemGordosLighterReplicant);
-				if (_vm->_cutContent) {
-					// Provide immediate feedback to the player that the lighter indicates Gordo is a Replicant,
-					// since the model of the lighter itself is not (much?) different than when he's human.
-					// Also these lines seem that they belong here (Act 3).
-					if (Actor_Clue_Query(kActorMcCoy, kClueZubenSquadPhoto)
-					    && (Global_Variable_Query(kVariableChapter) == 2 || Global_Variable_Query(kVariableChapter) == 3)) {
-						// NOTE this is only in TLK02
-						// so it should be for Act 2 and 3 only (The lighter is normally spawned in Act 3)
-						// NOTE 2 As of yet, we load all TLK resources in cut content mode (see Chapters::enterChapter()),
-						// so the check for specific chapters is redundantly restrictive here.
-						// TODO maybe we can remove it, if we're not concerned about minimum resource usage in cut content mode
-						Actor_Voice_Over(1450, kActorVoiceOver);
-					} else {
-						// TLK0A
-						// Re-use quote from Zuben's death (picking up his photo from the Rep Squad)
-						Actor_Voice_Over(350, kActorVoiceOver);
-					}
-					// NOTE this is only in TLK02
-					// so it should be for Act 2 and 3 only (The lighter is normally spawned in Act 3)
-					// NOTE 2 As of yet, we load all TLK resources in cut content mode (see Chapters::enterChapter()),
-					// so the check for specific chapters is redundantly restrictive here.
-					// TODO maybe we can remove it, if we're not concerned about minimum resource usage in cut content mode
-					if (Global_Variable_Query(kVariableChapter) == 2 || Global_Variable_Query(kVariableChapter) == 3) {
-						Actor_Voice_Over(1460, kActorVoiceOver);
-						Actor_Voice_Over(1470, kActorVoiceOver);
-					}
-				}
+				// NOTE Do not restore McCoy's voiceover on Gordo's lighter here,
+				// since it can overlap with Gordo's performance, especially if the player
+				// picks up the lighter just when Gordo's act is starting or has started
 				Item_Pickup_Spin_Effect(kModelAnimationGordosLighterReplicant, 214, 380);
 				Actor_Clue_Acquire(kActorMcCoy, kClueGordosLighterReplicant, true, -1);
 			}