[Scummvm-git-logs] scummvm master -> a95f18769ddc37902ec918c1ff2bdec869df481d
antoniou79
a.antoniou79 at gmail.com
Sat Feb 1 16:06:43 UTC 2020
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:
a95f18769d BLADERUNNER: Restore Rachael's missing dialogue in SPA/ITA
Commit: a95f18769ddc37902ec918c1ff2bdec869df481d
https://github.com/scummvm/scummvm/commit/a95f18769ddc37902ec918c1ff2bdec869df481d
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2020-02-01T18:03:38+02:00
Commit Message:
BLADERUNNER: Restore Rachael's missing dialogue in SPA/ITA
This only occurs on Spanish and Italian versions. ENG/DEU/FRA have a redundant line there.
Credits for spotting the missing Rachael's and Leary's lines again go to IlDucci of the Spanish translation team.
Changed paths:
engines/bladerunner/script/scene/rc01.cpp
engines/bladerunner/script/scene/tb07.cpp
engines/bladerunner/script/script.cpp
diff --git a/engines/bladerunner/script/scene/rc01.cpp b/engines/bladerunner/script/scene/rc01.cpp
index bfbb7f0..928a89f 100644
--- a/engines/bladerunner/script/scene/rc01.cpp
+++ b/engines/bladerunner/script/scene/rc01.cpp
@@ -336,14 +336,16 @@ bool SceneScriptRC01::ClickedOnActor(int actorId) {
Game_Flag_Set(kFlagRC01McCoyAndOfficerLearyTalking);
if (Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewA) && !Actor_Clue_Query(kActorMcCoy, kClueCrowdInterviewA)) {
Actor_Face_Object(kActorOfficerLeary, "70_1", true);
- Actor_Says(kActorOfficerLeary, 100, 15);
if (_vm->_cutContent
&& (_vm->_language == Common::ES_ESP
|| _vm->_language == Common::IT_ITA)
) {
// this is the second half of the sentence about Lucy hanging around with Zuben ("a fat guy")
// in ENG, DEU and FRA it is redundant, but it's needed in ESP and ITA
- Actor_Says(kActorOfficerLeary, 110, 15);
+ Actor_Says_With_Pause(kActorOfficerLeary, 100, 0.0f, 15);
+ Actor_Says(kActorOfficerLeary, 110, kAnimationModeTalk);
+ } else {
+ Actor_Says(kActorOfficerLeary, 100, 15);
}
Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true);
Actor_Clue_Acquire(kActorMcCoy, kClueCrowdInterviewA, true, kActorOfficerLeary);
@@ -640,7 +642,7 @@ void SceneScriptRC01::interrogateCrowd() {
|| (Actor_Clue_Query(kActorMcCoy, kClueCrowdInterviewA)
&& Actor_Clue_Query(kActorMcCoy, kClueCrowdInterviewB) )
) {
- Actor_Says(kActorMcCoy, 8525, 3); // generic "hmph"
+ Actor_Says(kActorMcCoy, 8525, kAnimationModeTalk); // generic "hmph"
return;
}
#endif // BLADERUNNER_ORIGINAL_BUGS
diff --git a/engines/bladerunner/script/scene/tb07.cpp b/engines/bladerunner/script/scene/tb07.cpp
index c03281f..dd70cb2 100644
--- a/engines/bladerunner/script/scene/tb07.cpp
+++ b/engines/bladerunner/script/scene/tb07.cpp
@@ -237,7 +237,7 @@ void SceneScriptTB07::McCoyTalkWithRachaelAndTyrell() {
Actor_Says(kActorRachael, 480, 14);
Actor_Face_Actor(kActorMcCoy, kActorRachael, true);
Actor_Says(kActorMcCoy, 5315, 9);
- Actor_Says(kActorRachael, 490, 3);
+ Actor_Says(kActorRachael, 490, kAnimationModeTalk);
Actor_Face_Heading(kActorMcCoy, 178, true);
Actor_Says(kActorMcCoy, 5320, 15);
Actor_Says_With_Pause(kActorMcCoy, 5325, 1.0f, 19);
@@ -249,12 +249,23 @@ void SceneScriptTB07::McCoyTalkWithRachaelAndTyrell() {
Actor_Says(kActorRachael, 510, 12);
Actor_Says(kActorMcCoy, 5335, 16);
Actor_Says(kActorRachael, 520, 17);
- Actor_Says(kActorMcCoy, 5340, 3);
+ Actor_Says(kActorMcCoy, 5340, kAnimationModeTalk);
Actor_Start_Speech_Sample(kActorRachael, 530);
Loop_Actor_Walk_To_XYZ(kActorRachael, -4.15f, 12.0f, 54.73f, 0, false, false, false);
Actor_Says(kActorRachael, 540, 16);
Actor_Says(kActorMcCoy, 5345, 18);
- Actor_Says(kActorRachael, 550, 13);
+ if (_vm->_cutContent
+ && (_vm->_language == Common::ES_ESP
+ || _vm->_language == Common::IT_ITA)
+ ) {
+ // this is the second half of the sentence about Tyrell having important meetings to attend to
+ // In ENG, DEU and FRA it is redundant because it, instead, re-uses a cut line from the removed elevator scene "Copies, only copies"
+ // However, it's needed in ESP and ITA
+ Actor_Says_With_Pause(kActorRachael, 550, 0.0f, 13);
+ Actor_Says(kActorRachael, 560, kAnimationModeTalk);
+ } else {
+ Actor_Says(kActorRachael, 550, 13);
+ }
Actor_Says(kActorRachael, 570, 18);
Actor_Says_With_Pause(kActorMcCoy, 5350, 0.0f, 18);
Actor_Says(kActorRachael, 580, 16);
@@ -263,7 +274,7 @@ void SceneScriptTB07::McCoyTalkWithRachaelAndTyrell() {
Actor_Says(kActorMcCoy, 5360, 17);
Actor_Says(kActorMcCoy, 5365, 13);
Actor_Says_With_Pause(kActorRachael, 600, 1.0f, 12);
- Actor_Says(kActorMcCoy, 5370, 3);
+ Actor_Says(kActorMcCoy, 5370, kAnimationModeTalk);
Loop_Actor_Walk_To_XYZ(kActorRachael, -24.15f, 12.0f, -10.84f, 0, false, false, false);
Actor_Says(kActorRachael, 610, 13);
Actor_Face_Actor(kActorMcCoy, kActorRachael, true);
@@ -276,7 +287,7 @@ void SceneScriptTB07::McCoyTalkWithRachaelAndTyrell() {
Actor_Says(kActorMcCoy, 5395, 15);
Actor_Says_With_Pause(kActorRachael, 630, 0.0f, 14);
Actor_Says(kActorMcCoy, 5400, 18);
- Actor_Says(kActorMcCoy, 5405, 3);
+ Actor_Says(kActorMcCoy, 5405, kAnimationModeTalk);
Actor_Says(kActorRachael, 640, 12);
Actor_Says(kActorMcCoy, 5410, 16);
Actor_Says(kActorRachael, 650, 15);
@@ -294,7 +305,7 @@ void SceneScriptTB07::McCoyTalkWithRachaelAndTyrell() {
Actor_Face_Actor(kActorMcCoy, kActorTyrell, true);
Actor_Face_Actor(kActorRachael, kActorTyrell, true);
Actor_Says(kActorTyrell, 10, 12);
- Actor_Says(kActorTyrell, 20, 3);
+ Actor_Says(kActorTyrell, 20, kAnimationModeTalk);
Actor_Says(kActorTyrell, 30, 12);
Actor_Says(kActorMcCoy, 5425, 18);
Actor_Set_Goal_Number(kActorRachael, kGoalRachaelLeavesAfterTyrellMeeting);
diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp
index b51a82d..e09c5f7 100644
--- a/engines/bladerunner/script/script.cpp
+++ b/engines/bladerunner/script/script.cpp
@@ -296,6 +296,11 @@ void ScriptBase::Actor_Says(int actorId, int sentenceId, int animationMode) {
Actor_Says_With_Pause(actorId, sentenceId, 0.5f, animationMode);
}
+/**
+* Actor actorId says the sentenceId, and then
+* if pause > 0.0f there will be a delay for "pause" seconds.
+* pause can be 0.0f
+*/
void ScriptBase::Actor_Says_With_Pause(int actorId, int sentenceId, float pause, int animationMode) {
debugC(kDebugScript, "Actor_Says_With_Pause(%d, %d, %f, %d)", actorId, sentenceId, pause, animationMode);
_vm->gameWaitForActive();
More information about the Scummvm-git-logs
mailing list