[Scummvm-git-logs] scummvm master -> 5dd8aa77cfc4610345cc924d9bc0a1f2769e1e61
antoniou79
antoniou at cti.gr
Sun Jun 9 17:56:03 CEST 2019
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:
5dd8aa77cf BLADERUNNER: Restored a cue in Grigorian's VK
Commit: 5dd8aa77cfc4610345cc924d9bc0a1f2769e1e61
https://github.com/scummvm/scummvm/commit/5dd8aa77cfc4610345cc924d9bc0a1f2769e1e61
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-06-09T18:54:27+03:00
Commit Message:
BLADERUNNER: Restored a cue in Grigorian's VK
Changed paths:
engines/bladerunner/script/scene/nr01.cpp
engines/bladerunner/script/scene/nr11.cpp
engines/bladerunner/script/vk_script.cpp
diff --git a/engines/bladerunner/script/scene/nr01.cpp b/engines/bladerunner/script/scene/nr01.cpp
index e696edf..3a0b46d 100644
--- a/engines/bladerunner/script/scene/nr01.cpp
+++ b/engines/bladerunner/script/scene/nr01.cpp
@@ -383,13 +383,13 @@ void SceneScriptNR01::PlayerWalkedIn() {
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleImmediatelyStartChapter4);
} else {
int v0 = Global_Variable_Query(kVariableHollowayArrest);
- if (v0 == 1) {
+ if (v0 == 1) { // Dektora called the fake cops
Actor_Says(kActorSteele, 1510, 15);
Actor_Says(kActorSteele, 1520, 14);
Actor_Says(kActorSteele, 1530, 13);
Actor_Says(kActorMcCoy, 3170, 13);
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR01GoToNR08);
- } else if (v0 == 2) {
+ } else if (v0 == 2) { // Gordo called the fake cops
Actor_Says(kActorSteele, 1590, 15);
Actor_Says(kActorMcCoy, 3195, 14);
Actor_Says(kActorSteele, 1600, 16);
@@ -399,7 +399,7 @@ void SceneScriptNR01::PlayerWalkedIn() {
Actor_Says(kActorSteele, 1630, 14);
Actor_Says(kActorMcCoy, 3205, 12);
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR01GoToNR02);
- } else if (v0 == 3) {
+ } else if (v0 == 3) { // Lucy called the fake cops
Actor_Says(kActorSteele, 1540, 15);
Actor_Says(kActorMcCoy, 3175, 13);
Actor_Says(kActorSteele, 1550, 13);
diff --git a/engines/bladerunner/script/scene/nr11.cpp b/engines/bladerunner/script/scene/nr11.cpp
index c52208e..065b775 100644
--- a/engines/bladerunner/script/scene/nr11.cpp
+++ b/engines/bladerunner/script/scene/nr11.cpp
@@ -364,7 +364,7 @@ void SceneScriptNR11::PlayerWalkedIn() {
Delay(500);
Actor_Face_Current_Camera(kActorMcCoy, true);
Delay(750);
- Actor_Says(kActorMcCoy, 5290, 12);
+ Actor_Says(kActorMcCoy, 5290, 12); // Jesus
Delay(1000);
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR11Enter);
Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
diff --git a/engines/bladerunner/script/vk_script.cpp b/engines/bladerunner/script/vk_script.cpp
index cb6ed88..158f9eb 100644
--- a/engines/bladerunner/script/vk_script.cpp
+++ b/engines/bladerunner/script/vk_script.cpp
@@ -1343,6 +1343,9 @@ void VKScript::askGrigorian(int questionId) {
VK_Eye_Animates(2);
VK_Play_Speech_Line(kActorGrigorian, 1110, 0.5f);
VK_Play_Speech_Line(kActorMcCoy, 8210, 0.5f);
+ if (_vm->_cutContent) {
+ VK_Play_Speech_Line(kActorMcCoy, 8215, 0.5f);
+ }
break;
case 7750: // High 09
VK_Eye_Animates(2);
More information about the Scummvm-git-logs
mailing list