[Scummvm-git-logs] scummvm master -> 6f70d3530c15322472ec20ffcc2273d09d9775c0

[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:
6f70d3530c BLADERUNNER: Fix a couple of Act 4 quotes


Commit: 6f70d3530c15322472ec20ffcc2273d09d9775c0
    https://github.com/scummvm/scummvm/commit/6f70d3530c15322472ec20ffcc2273d09d9775c0
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2020-03-05T23:56:30+02:00

Commit Message:
BLADERUNNER: Fix a couple of Act 4 quotes

Changed paths:
    engines/bladerunner/script/scene/ug16.cpp
    engines/bladerunner/script/scene/ug18.cpp


diff --git a/engines/bladerunner/script/scene/ug16.cpp b/engines/bladerunner/script/scene/ug16.cpp
index b6f5c21553..3f8c5bb3cb 100644
--- a/engines/bladerunner/script/scene/ug16.cpp
+++ b/engines/bladerunner/script/scene/ug16.cpp
@@ -384,7 +384,12 @@ void SceneScriptUG16::dialogueWithLuther() {
 		Actor_Says(kActorLuther, 390, 23);
 		Actor_Says(kActorLance, 410, 14);
 		Actor_Says(kActorLance, 420, 17);
+#if BLADERUNNER_ORIGINAL_BUGS
+		// This quote is repeated (also used in RUNCITER question
+		// "That probably had something to do with you guys getting fired."
+		// It makes little sense to be here.
 		Actor_Says(kActorMcCoy, 5835, 13);
+#endif // BLADERUNNER_ORIGINAL_BUGS
 		Delay(1000);
 		Item_Pickup_Spin_Effect(kModelAnimationFolder, 239, 454);
 		Actor_Voice_Over(2740, kActorVoiceOver);
diff --git a/engines/bladerunner/script/scene/ug18.cpp b/engines/bladerunner/script/scene/ug18.cpp
index 4201d3b0e7..07d5d80a97 100644
--- a/engines/bladerunner/script/scene/ug18.cpp
+++ b/engines/bladerunner/script/scene/ug18.cpp
@@ -526,7 +526,11 @@ void SceneScriptUG18::talkWithGuzza() {
 	Actor_Says(kActorGuzza, 850, 14);
 	Actor_Says(kActorGuzza, 860, 13);
 	Actor_Says(kActorMcCoy, 5880, 15);
+#if BLADERUNNER_ORIGINAL_BUGS
 	Actor_Says(kActorMcCoy, 5885, 9);
+#else
+	Actor_Says_With_Pause(kActorMcCoy, 5885, 0.0f, 9);
+#endif // BLADERUNNER_ORIGINAL_BUGS
 	Actor_Says(kActorMcCoy, 5890, 13);
 	Actor_Says(kActorGuzza, 870, 15);
 	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -205.13f, 0.0f, -184.47f, 0, false, false, false);