From 4d260ea3492c7674192a253dc210111991ad7b63 Mon Sep 17 00:00:00 2001 From: Thanasis Antoniou Date: Sun, 19 Jan 2020 00:51:51 +0200 Subject: [PATCH] BLADERUNNER: SUBTITLES: Added TB_FLY to subtitle-able videos --- engines/bladerunner/script/ai/holloway.cpp | 2 +- engines/bladerunner/script/scene/tb02.cpp | 2 +- engines/bladerunner/subtitles.cpp | 3 ++- engines/bladerunner/subtitles.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/engines/bladerunner/script/ai/holloway.cpp b/engines/bladerunner/script/ai/holloway.cpp index c7eb29ea706..ae3aa187ce8 100644 --- a/engines/bladerunner/script/ai/holloway.cpp +++ b/engines/bladerunner/script/ai/holloway.cpp @@ -174,7 +174,7 @@ bool AIScriptHolloway::GoalChanged(int currentGoalNumber, int newGoalNumber) { Ambient_Sounds_Remove_All_Looping_Sounds(1); Player_Gains_Control(); - Outtake_Play(kOuttakeInterrogation, 0, 1); + Outtake_Play(kOuttakeInterrogation, false, 1); if (Global_Variable_Query(kVariableHollowayArrest) == 1) { Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR08ReadyToRun); diff --git a/engines/bladerunner/script/scene/tb02.cpp b/engines/bladerunner/script/scene/tb02.cpp index 28c84d526bd..77394b7f79d 100644 --- a/engines/bladerunner/script/scene/tb02.cpp +++ b/engines/bladerunner/script/scene/tb02.cpp @@ -34,7 +34,7 @@ void SceneScriptTB02::InitializeScene() { } else { Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); - Outtake_Play(kOuttakeTyrellBuildingFly, false, -1); + Outtake_Play(kOuttakeTyrellBuildingFly, false, -1); // TB_FLY_#.VQA Note: this is the only fly-through scene that is localized! Setup_Scene_Information(-304.0f, -81.46f, 1434.0f, 250); } if (Global_Variable_Query(kVariableChapter) > 3) { diff --git a/engines/bladerunner/subtitles.cpp b/engines/bladerunner/subtitles.cpp index e0b7378928a..a1f12f2d4a1 100644 --- a/engines/bladerunner/subtitles.cpp +++ b/engines/bladerunner/subtitles.cpp @@ -92,7 +92,8 @@ const char *Subtitles::SUBTITLES_FILENAME_PREFIXES[kMaxTextResourceEntries] = { "END01D", // 22 "END01E", // 23 "END01F", // 24 - "END03" // 25 + "END03", // 25 + "TB_FLY" // 26 }; /** diff --git a/engines/bladerunner/subtitles.h b/engines/bladerunner/subtitles.h index b84e0cf704e..713e45efb44 100644 --- a/engines/bladerunner/subtitles.h +++ b/engines/bladerunner/subtitles.h @@ -45,7 +45,7 @@ class Subtitles { static const uint kPreferedLine = 2; // Prefer drawing from this line (the bottom-most of available subtitle lines index is 0) by default static const int kMarginBottom = 12; // In pixels. This is the bottom margin beneath the subtitles space static const int kTextMaxWidth = 610; // In pixels - static const int kMaxTextResourceEntries = 1 + 25; // Support in-game subs (1) and all possible VQAs (25) with spoken dialogue or translatable text + static const int kMaxTextResourceEntries = 27; // Support in-game subs (1) and all possible VQAs (26) with spoken dialogue or translatable text static const char *SUBTITLES_FILENAME_PREFIXES[kMaxTextResourceEntries]; static const char *SUBTITLES_FONT_FILENAME_EXTERNAL; static const char *SUBTITLES_VERSION_TRENAME;