[Scummvm-git-logs] scummvm master -> eae6bed7d37f7cf4182c6a505f39b05a542b4f2c

[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:
eae6bed7d3 BLADERUNNER: Fix more missing quotes for localized versions


Commit: eae6bed7d37f7cf4182c6a505f39b05a542b4f2c
    https://github.com/scummvm/scummvm/commit/eae6bed7d37f7cf4182c6a505f39b05a542b4f2c
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2020-02-03T00:48:03+02:00

Commit Message:
BLADERUNNER: Fix more missing quotes for localized versions

Credits to IlDucci's notes, from the Spanish translation team

This fix restores some lines for BulletBob, Hasan and DeskClerk

Changed paths:
    engines/bladerunner/script/ai/hasan.cpp
    engines/bladerunner/script/scene/ar02.cpp
    engines/bladerunner/script/scene/ct09.cpp
    engines/bladerunner/script/vk_script.cpp


diff --git a/engines/bladerunner/script/ai/hasan.cpp b/engines/bladerunner/script/ai/hasan.cpp
index 33925e0..2ab41cb 100644
--- a/engines/bladerunner/script/ai/hasan.cpp
+++ b/engines/bladerunner/script/ai/hasan.cpp
@@ -360,13 +360,13 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) {
 
 bool AIScriptHasan::ChangeAnimationMode(int mode) {
 	switch (mode) {
-	case 0:
+	case kAnimationModeIdle:
 		_animationState = 0;
 		_var6 = 0;
 		_animationFrame = 0;
 		break;
 
-	case 3:
+	case kAnimationModeTalk:
 		_animationState = 1;
 		_var6 = 0;
 		_animationFrame = 0;
diff --git a/engines/bladerunner/script/scene/ar02.cpp b/engines/bladerunner/script/scene/ar02.cpp
index 165a8ae..f401886 100644
--- a/engines/bladerunner/script/scene/ar02.cpp
+++ b/engines/bladerunner/script/scene/ar02.cpp
@@ -570,12 +570,32 @@ void SceneScriptAR02::dialogueWithHassan() {
 	case 570: // DONE
 		if (!Actor_Clue_Query(kActorMcCoy, kClueHasanInterview)) {
 			Actor_Says(kActorMcCoy, 940, 13);
-			Actor_Says(kActorHasan, 70, 12);
+			// Quote 80 is *boop* in ENG and DEU versions
+			// In FRA, ITA versions it is identical to the second half of quote 70, and thus redundant
+			// In ESP version it is the missing second half of quote 70, and is required!
+			if (_vm->_cutContent
+			    && _vm->_language == Common::ES_ESP
+			) {
+				Actor_Says_With_Pause(kActorHasan, 70, 0.0f, 12);
+				Actor_Says(kActorHasan, 80, kAnimationModeTalk);
+			} else {
+				Actor_Says(kActorHasan, 70, 12);
+			}
 			Actor_Says(kActorHasan, 90, 12);
 			Actor_Says(kActorMcCoy, 180, 15);
 			Actor_Says(kActorHasan, 100, 14);
 			Actor_Says(kActorHasan, 110, 12);
-			Actor_Says(kActorHasan, 120, 13);
+			// Quote 130 is *boop* in ENG and DEU versions
+			// In FRA, ITA versions it is identical to the second half of quote 120, and thus redundant
+			// In ESP version it is the missing second half of quote 120, and is required!
+			if (_vm->_cutContent
+			    && _vm->_language == Common::ES_ESP
+			) {
+				Actor_Says_With_Pause(kActorHasan, 120, 0.0f, 13);
+				Actor_Says(kActorHasan, 130, kAnimationModeTalk);
+			} else {
+				Actor_Says(kActorHasan, 120, 13);
+			}
 			Actor_Modify_Friendliness_To_Other(kActorHasan, kActorMcCoy, -1);
 			Actor_Clue_Acquire(kActorMcCoy, kClueHasanInterview, false, kActorHasan);
 		} else {
diff --git a/engines/bladerunner/script/scene/ct09.cpp b/engines/bladerunner/script/scene/ct09.cpp
index dcf5549..7f31257 100644
--- a/engines/bladerunner/script/scene/ct09.cpp
+++ b/engines/bladerunner/script/scene/ct09.cpp
@@ -205,7 +205,18 @@ void SceneScriptCT09::PlayerWalkedIn() {
 			Actor_Says(kActorMcCoy, 605, 13);
 			Actor_Says(kActorDeskClerk, 90, 15);
 		} else {
-			Actor_Says(kActorDeskClerk, 20, 12);
+			// Quote 30 is *boop* in ENG and DEU versions
+			// In FRA version it is muted
+			// In ESP and ITA versions it is the missing second half of quote 20, and is required!
+			if (_vm->_cutContent
+			    && (_vm->_language == Common::ES_ESP
+			        || _vm->_language == Common::IT_ITA)
+			) {
+				Actor_Says_With_Pause(kActorDeskClerk, 20, 0.0f, 12);
+				Actor_Says(kActorDeskClerk, 30, kAnimationModeTalk);
+			} else {
+				Actor_Says(kActorDeskClerk, 20, 12);
+			}
 			Actor_Face_Actor(kActorMcCoy, kActorDeskClerk, true);
 			Actor_Says(kActorMcCoy, 585, 18);
 			Actor_Says(kActorDeskClerk, 40, 15);
diff --git a/engines/bladerunner/script/vk_script.cpp b/engines/bladerunner/script/vk_script.cpp
index ca6047e..6cf457f 100644
--- a/engines/bladerunner/script/vk_script.cpp
+++ b/engines/bladerunner/script/vk_script.cpp
@@ -2345,7 +2345,31 @@ void VKScript::askBulletBob(int questionId) {
 			Delay(2000u);
 			VK_Play_Speech_Line(kActorMcCoy, 8270, 0.5f);
 		}
-		VK_Play_Speech_Line(kActorBulletBob, 1240, 0.5f);
+		// Quote 1220 is *boop* in ENG and ITA versions
+		// In DEU version it seems largely redundant; it is one word, identical to the first word of quote 1240.
+		// In FRA version it is also one word, similar (but not identical) to how quote 1240 starts.
+		// In ESP version it can complement the following quote 1240
+		if (_vm->_cutContent) {
+			if (_vm->_language == Common::ES_ESP) {
+				// play both 1220, 1240
+				VK_Play_Speech_Line(kActorBulletBob, 1220, 0.5f);
+				VK_Play_Speech_Line(kActorBulletBob, 1240, 0.5f);
+			} else if (_vm->_language == Common::FR_FRA
+			           || _vm->_language == Common::DE_DEU){
+				// play either 1220 or 1240
+				if (Random_Query(0, 1)) {
+					VK_Play_Speech_Line(kActorBulletBob, 1220, 0.5f);
+				} else {
+					VK_Play_Speech_Line(kActorBulletBob, 1240, 0.5f);
+				}
+			} else {
+				// play only 1240
+				VK_Play_Speech_Line(kActorBulletBob, 1240, 0.5f);
+			}
+		} else {
+			// vanilla mode plays only 1240
+			VK_Play_Speech_Line(kActorBulletBob, 1240, 0.5f);
+		}
 		break;
 	case 7475:                          // Medium 01
 		VK_Play_Speech_Line(kActorBulletBob, 1250, 0.5f);