[Scummvm-git-logs] scummvm master -> 4e17b4feec34f4d33b643fee782930aaabfcf649
antoniou79
antoniou at cti.gr
Mon May 27 01:21:33 CEST 2019
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e6f0c5e8a7 BLADERUNNER: Expose info for view in debugger list obj
4e17b4feec BLADERUNNER: Restore lines from Grigorian and Izo
Commit: e6f0c5e8a75e486f642fa9d3be4afa839bc50c3f
https://github.com/scummvm/scummvm/commit/e6f0c5e8a75e486f642fa9d3be4afa839bc50c3f
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-05-27T00:11:12+03:00
Commit Message:
BLADERUNNER: Expose info for view in debugger list obj
Changed paths:
engines/bladerunner/debugger.cpp
diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp
index 9cfb5d7..593ecff 100644
--- a/engines/bladerunner/debugger.cpp
+++ b/engines/bladerunner/debugger.cpp
@@ -1923,6 +1923,14 @@ bool Debugger::cmdList(int argc, const char **argv) {
invalidSyntax = true;
}
} else if (arg == "obj") {
+ debugPrintf("View info\nCamera position: (%5.2f, %5.2f, %5.2f), Viewport position: (%5.2f, %5.2f, %5.2f), FoVx: %2.2f\n",
+ _vm->_view->_cameraPosition.x,
+ _vm->_view->_cameraPosition.y,
+ _vm->_view->_cameraPosition.z,
+ _vm->_view->_viewportPosition.x,
+ _vm->_view->_viewportPosition.y,
+ _vm->_view->_viewportPosition.z,
+ _vm->_view->_fovX);
debugPrintf("Listing scene objects: \n");
int count = 0;
for (int i = 0; i < _vm->_sceneObjects->_count; i++) {
Commit: 4e17b4feec34f4d33b643fee782930aaabfcf649
https://github.com/scummvm/scummvm/commit/4e17b4feec34f4d33b643fee782930aaabfcf649
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-05-27T02:20:37+03:00
Commit Message:
BLADERUNNER: Restore lines from Grigorian and Izo
Changed paths:
engines/bladerunner/script/kia_script.cpp
engines/bladerunner/script/scene/hc01.cpp
engines/bladerunner/script/scene/ps09.cpp
diff --git a/engines/bladerunner/script/kia_script.cpp b/engines/bladerunner/script/kia_script.cpp
index 35f26ae..4475e86 100644
--- a/engines/bladerunner/script/kia_script.cpp
+++ b/engines/bladerunner/script/kia_script.cpp
@@ -797,26 +797,35 @@ void KIAScript::SCRIPT_KIA_DLL_Play_Clue_Asset_Script(int notUsed, int clueId) {
KIA_Play_Actor_Dialogue(kActorSteele, 3540);
break;
case kClueGrigorianInterviewB1:
- KIA_Play_Actor_Dialogue(kActorSteele, 3550);
- KIA_Play_Actor_Dialogue(kActorGrigorian, 1360);
+ // Izo is a Replicant
+ KIA_Play_Actor_Dialogue(kActorSteele, 3550); // Describe them to me again.
+ KIA_Play_Actor_Dialogue(kActorGrigorian, 1360); // Just the Rastafarian fellow. And that-- that friend of his. A slim blond man, Asian. With-- with a ponytail.
KIA_Play_Actor_Dialogue(kActorGrigorian, 1370);
- KIA_Play_Actor_Dialogue(kActorSteele, 3560);
+ if (_vm->_cutContent) {
+ KIA_Play_Actor_Dialogue(kActorSteele, 3620); // Let me ask you a question.
+ KIA_Play_Actor_Dialogue(kActorSteele, 3630);
+ KIA_Play_Actor_Dialogue(kActorGrigorian, 1380);
+ KIA_Play_Actor_Dialogue(kActorSteele, 3640); // such as
+ KIA_Play_Actor_Dialogue(kActorGrigorian, 1390);
+ }
+ KIA_Play_Actor_Dialogue(kActorSteele, 3560); // Bravo, Spencer.
KIA_Play_Actor_Dialogue(kActorSteele, 3570);
break;
case kClueGrigorianInterviewB2:
- KIA_Play_Actor_Dialogue(kActorSteele, 3580);
- KIA_Play_Actor_Dialogue(kActorGrigorian, 1400);
+ // Izo is a human
+ KIA_Play_Actor_Dialogue(kActorSteele, 3580); // Describe them for me again.
+ KIA_Play_Actor_Dialogue(kActorGrigorian, 1400); // There was that Rastafarian fellow and one of our ex members showed up.
KIA_Play_Actor_Dialogue(kActorSteele, 3590);
- KIA_Play_Actor_Dialogue(kActorGrigorian, 1410);
+ KIA_Play_Actor_Dialogue(kActorGrigorian, 1410); // A Japanese man named Izo.
KIA_Play_Actor_Dialogue(kActorSteele, 3600);
- KIA_Play_Actor_Dialogue(kActorGrigorian, 1420);
- KIA_Play_Actor_Dialogue(kActorGrigorian, 1430);
+ KIA_Play_Actor_Dialogue(kActorGrigorian, 1420); // We're a pacifist organization and we have rules
+ KIA_Play_Actor_Dialogue(kActorGrigorian, 1430); // Izo refused to check in his samurai sword
KIA_Play_Actor_Dialogue(kActorSteele, 3610);
KIA_Play_Actor_Dialogue(kActorGrigorian, 1440);
- KIA_Play_Actor_Dialogue(kActorSteele, 3620);
+ KIA_Play_Actor_Dialogue(kActorSteele, 3620); // Let me ask you a question.
KIA_Play_Actor_Dialogue(kActorSteele, 3630);
KIA_Play_Actor_Dialogue(kActorGrigorian, 1450);
- KIA_Play_Actor_Dialogue(kActorSteele, 3640);
+ KIA_Play_Actor_Dialogue(kActorSteele, 3640); // such as
KIA_Play_Actor_Dialogue(kActorGrigorian, 1460);
KIA_Play_Actor_Dialogue(kActorSteele, 3650);
break;
diff --git a/engines/bladerunner/script/scene/hc01.cpp b/engines/bladerunner/script/scene/hc01.cpp
index 7d1f892..5c25d92 100644
--- a/engines/bladerunner/script/scene/hc01.cpp
+++ b/engines/bladerunner/script/scene/hc01.cpp
@@ -104,6 +104,9 @@ bool SceneScriptHC01::ClickedOnActor(int actorId) {
if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 624.43f, 0.14f, 83.0f, 0, true, false, false)) {
if (!Game_Flag_Query(kFlagHC01IzoTalk1)) {
Actor_Face_Actor(kActorIzo, kActorMcCoy, true);
+ if (_vm->_cutContent) {
+ Actor_Says_With_Pause(kActorIzo, 0, 0.2f, 13);
+ }
Actor_Says_With_Pause(kActorIzo, 10, 0.2f, 13);
Actor_Face_Actor(kActorMcCoy, kActorIzo, true);
Actor_Says(kActorIzo, 20, 17);
@@ -273,16 +276,37 @@ void SceneScriptHC01::dialogueWithIzo() {
} else if (Actor_Clue_Query(kActorMcCoy, kClueShellCasings)) {
DM_Add_To_List_Never_Repeat_Once_Selected(1040, 4, 4, 6); // SHELL CASINGS
}
+#if BLADERUNNER_ORIGINAL_BUGS
if (Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB2)) {
DM_Add_To_List_Never_Repeat_Once_Selected(1050, -1, 3, 8); // GRIGORIAN 1
} else if (Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB1)) {
DM_Add_To_List_Never_Repeat_Once_Selected(1060, -1, 3, 8); // GRIGORIAN 2
}
+#else
+ // When McCoy has kClueGrigorianInterviewB1 then Izo is a Replicant
+ // and when he has kClueGrigorianInterviewB2 then Izo is a human
+ // However the dialogue menu options are actually reversed in the original
+ // and inconsistent with what Grigorian says in his interviews.
+ // The 1050 dialogue menu option belongs to the case where Izo is a Replicant
+ // because in that dialogue McCoy mentions that Grigorian described him to a tee (which he does in kClueGrigorianInterviewB1)
+ // And the 1060 dialogue menu option belongs to the case where Izo is a human
+ // because in that dialogue McCoy talks about how Izo is a psychopath and was thrown out of CARS
+ // which is what Grigorian says in kClueGrigorianInterviewB2
+ if (Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB1)) {
+ DM_Add_To_List_Never_Repeat_Once_Selected(1050, -1, 3, 8); // GRIGORIAN 1
+ } else if (Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB2)) {
+ DM_Add_To_List_Never_Repeat_Once_Selected(1060, -1, 3, 8); // GRIGORIAN 2
+ }
+#endif // BLADERUNNER_ORIGINAL_BUGS
if (Dialogue_Menu_Query_List_Size() == 0) {
Actor_Says_With_Pause(kActorMcCoy, 1105, 1.2f, 13);
if (Actor_Query_Friendliness_To_Other(kActorIzo, kActorMcCoy) < 50) {
Actor_Says(kActorIzo, 550, 15);
+ if (_vm->_cutContent) {
+ Actor_Says(kActorMcCoy, 1220, 14); // you can bet...
+ Actor_Says(kActorIzo, 560, kAnimationModeTalk); // i'll be here
+ }
} else {
Actor_Says(kActorIzo, 250, 13);
Actor_Modify_Friendliness_To_Other(kActorIzo, kActorMcCoy, -1);
@@ -319,11 +343,17 @@ void SceneScriptHC01::dialogueWithIzo() {
if (answer == 1020) { // DRAGONFLY JEWERLY
Dialogue_Menu_Remove_From_List(1020);
Actor_Says(kActorMcCoy, 1065, 15);
- Actor_Says(kActorIzo, 160, kAnimationModeTalk);
- Actor_Says(kActorMcCoy, 1110, 16);
- Actor_Says(kActorIzo, 170, kAnimationModeTalk);
- Actor_Says(kActorIzo, 180, kAnimationModeTalk);
- Actor_Says(kActorIzo, 190, 12);
+ if (_vm->_cutContent && Game_Flag_Query(kFlagIzoIsReplicant)) {
+ // Restored: if Izo is a Replicant, he would probably lie
+ // so this line goes here
+ Actor_Says(kActorIzo, 150, kAnimationModeTalk);
+ } else {
+ Actor_Says(kActorIzo, 160, kAnimationModeTalk);
+ Actor_Says(kActorMcCoy, 1110, 16);
+ Actor_Says(kActorIzo, 170, kAnimationModeTalk);
+ Actor_Says(kActorIzo, 180, kAnimationModeTalk);
+ Actor_Says(kActorIzo, 190, 12);
+ }
if (Query_Difficulty_Level() < kGameDifficultyHard) {
Actor_Modify_Friendliness_To_Other(kActorIzo, kActorMcCoy, -2);
}
@@ -370,20 +400,20 @@ void SceneScriptHC01::dialogueWithIzo() {
Actor_Says(kActorIzo, 350, 12);
end = true;
}
- if (answer == 1050) { // GRIGORIAN 1
+ if (answer == 1050) { // GRIGORIAN 1 // Izo is Replicant
Dialogue_Menu_Remove_From_List(1050);
- Actor_Says(kActorMcCoy, 1090, 18);
+ Actor_Says(kActorMcCoy, 1090, 18); // Ever consort with a group called CARS? C.A.R.S.?
Actor_Says(kActorIzo, 360, 14);
Actor_Says(kActorMcCoy, 1150, 17);
Actor_Says(kActorIzo, 370, 13);
Actor_Says(kActorMcCoy, 1155, 15);
Actor_Says(kActorIzo, 380, 12);
- Actor_Says(kActorMcCoy, 1160, 14);
- Actor_Says(kActorMcCoy, 1165, 18);
+ Actor_Says(kActorMcCoy, 1160, 14); // He described you to a tee
+ Actor_Says(kActorMcCoy, 1165, 18); // Even down to that stupid little ponytail you got.
Actor_Says(kActorIzo, 390, 16);
- Actor_Says(kActorMcCoy, 1170, 12);
+ Actor_Says(kActorMcCoy, 1170, 12); // What would you say if I told you Grigorian named you
Actor_Says(kActorIzo, 400, 13);
- Actor_Says(kActorMcCoy, 1180, 14);
+ Actor_Says(kActorMcCoy, 1180, 14); // So, you're denying all involvement?
Actor_Says(kActorIzo, 410, 12);
Actor_Says(kActorIzo, 420, 16);
Actor_Says(kActorIzo, 430, 17);
@@ -394,15 +424,15 @@ void SceneScriptHC01::dialogueWithIzo() {
}
end = true;
}
- if (answer == 1060) { // GRIGORIAN 2
+ if (answer == 1060) { // GRIGORIAN 2 - Izo is a human, ex member of CARS
Dialogue_Menu_Remove_From_List(1060);
Actor_Says(kActorMcCoy, 1095, 15);
- Actor_Says_With_Pause(kActorMcCoy, 1100, 1.2f, 18);
+ Actor_Says_With_Pause(kActorMcCoy, 1100, 1.2f, 18); // That go for your old buddy Spencer Grigorian, too?
Actor_Says(kActorIzo, 450, 12);
Actor_Says(kActorIzo, 460, 13);
- Actor_Says(kActorMcCoy, 1185, 18);
+ Actor_Says(kActorMcCoy, 1185, 18); // Calfskin?
Actor_Says(kActorIzo, 470, 14);
- Actor_Says(kActorMcCoy, 1190, 14);
+ Actor_Says(kActorMcCoy, 1190, 14); // Grigorian said you were thrown out of C.A.R.S.
Actor_Says(kActorIzo, 480, 13);
Actor_Says(kActorMcCoy, 1195, 16);
Actor_Says(kActorMcCoy, 1200, 18);
@@ -420,6 +450,9 @@ void SceneScriptHC01::dialogueWithIzo() {
end = true;
}
if (answer == 100) { // DONE
+ if (_vm->_cutContent) {
+ Actor_Says(kActorMcCoy, 1215, 16); // All right
+ }
end = true;
}
} while (!end);
diff --git a/engines/bladerunner/script/scene/ps09.cpp b/engines/bladerunner/script/scene/ps09.cpp
index b6a3b26..9b38721 100644
--- a/engines/bladerunner/script/scene/ps09.cpp
+++ b/engines/bladerunner/script/scene/ps09.cpp
@@ -347,6 +347,9 @@ void SceneScriptPS09::dialogueWithGrigorian() {
Actor_Says(kActorGrigorian, 170, 15);
Actor_Says(kActorGrigorian, 180, 16);
Actor_Says(kActorMcCoy, 4315, 18);
+ if (_vm->_cutContent) {
+ Actor_Says(kActorGrigorian, 190, kAnimationModeTalk); // Everything and anything.
+ }
Actor_Says(kActorGrigorian, 200, 13);
return;
}
@@ -359,11 +362,17 @@ void SceneScriptPS09::dialogueWithGrigorian() {
Actor_Says(kActorGrigorian, 220, 13);
Actor_Says(kActorGrigorian, 230, 14);
Actor_Says(kActorMcCoy, 4320, 14);
+ if (_vm->_cutContent) {
+ Actor_Says(kActorMcCoy, 4325, kAnimationModeTalk); // What else do you guys do besides wave signs
+ }
Actor_Says(kActorGrigorian, 240, 16);
Actor_Says(kActorGrigorian, 250, 15);
Actor_Says(kActorMcCoy, 4330, 13);
Actor_Says(kActorGrigorian, 260, 13);
Actor_Says(kActorGrigorian, 270, 12);
+ if (_vm->_cutContent) {
+ Actor_Says(kActorGrigorian, 280, 12); // A way for the slaves to escape
+ }
Actor_Says(kActorMcCoy, 4335, 18);
Actor_Says(kActorGrigorian, 290, 15);
Actor_Says(kActorMcCoy, 4340, 13);
@@ -391,6 +400,9 @@ void SceneScriptPS09::dialogueWithGrigorian() {
Actor_Says(kActorCrazylegs, 1080, kAnimationModeTalk);
} else {
Actor_Says(kActorGrigorian, 320, 13);
+ if (_vm->_cutContent) {
+ Actor_Says(kActorGrigorian, 330, kAnimationModeTalk); // Friends with access to vehicles
+ }
Actor_Says(kActorGrigorian, 340, 14);
Actor_Says(kActorGrigorian, 350, 12);
Actor_Says(kActorMcCoy, 4375, 18);
More information about the Scummvm-git-logs
mailing list