[Scummvm-git-logs] scummvm master -> a14dffbf4b8c7ba51e4c801cc49584dc974864dc
antoniou79
antoniou at cti.gr
Mon May 13 09:27:13 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:
c352c2ed1b BLADERUNNER: Speech when click on barkeep from HC01
a14dffbf4b BLADERUNNER: fix for homeless found cases
Commit: c352c2ed1bec7fa518a9245e66b63f0c6001c7a9
https://github.com/scummvm/scummvm/commit/c352c2ed1bec7fa518a9245e66b63f0c6001c7a9
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-05-13T10:07:07+03:00
Commit Message:
BLADERUNNER: Speech when click on barkeep from HC01
Added behavior identical for similar cases (CT12, AR01)
Changed paths:
engines/bladerunner/script/scene/ct12.cpp
engines/bladerunner/script/scene/hc01.cpp
diff --git a/engines/bladerunner/script/scene/ct12.cpp b/engines/bladerunner/script/scene/ct12.cpp
index 88b59ca..5eb4876 100644
--- a/engines/bladerunner/script/scene/ct12.cpp
+++ b/engines/bladerunner/script/scene/ct12.cpp
@@ -138,6 +138,7 @@ bool SceneScriptCT12::ClickedOnActor(int actorId) {
}
// cut off feature? grayford never visit CT12 as goal 308 is never triggered
+ // bug? Marking this as a bug to revisit at a later time
if (actorId == kActorOfficerGrayford
&& Global_Variable_Query(kVariableChapter) == 4
&& Game_Flag_Query(kFlagUG18GuzzaScene)
diff --git a/engines/bladerunner/script/scene/hc01.cpp b/engines/bladerunner/script/scene/hc01.cpp
index 1a44fab..7d1f892 100644
--- a/engines/bladerunner/script/scene/hc01.cpp
+++ b/engines/bladerunner/script/scene/hc01.cpp
@@ -125,6 +125,15 @@ bool SceneScriptHC01::ClickedOnActor(int actorId) {
}
AI_Movement_Track_Unpause(kActorIzo);
}
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+ // barkeep is click-able from afar
+ // Add behavior similar to Howie Lee (CT12), Hasan, and Insect Dealer (AR01).
+ else if (actorId == kActorHawkersBarkeep) {
+ Actor_Face_Actor(kActorMcCoy, actorId, true);
+ Actor_Says(kActorMcCoy, 8910, 14);
+ }
+#endif // BLADERUNNER_ORIGINAL_BUGS
return false;
}
Commit: a14dffbf4b8c7ba51e4c801cc49584dc974864dc
https://github.com/scummvm/scummvm/commit/a14dffbf4b8c7ba51e4c801cc49584dc974864dc
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-05-13T10:26:00+03:00
Commit Message:
BLADERUNNER: fix for homeless found cases
Changed paths:
engines/bladerunner/script/ai/howie_lee.cpp
engines/bladerunner/script/ai/steele.cpp
diff --git a/engines/bladerunner/script/ai/howie_lee.cpp b/engines/bladerunner/script/ai/howie_lee.cpp
index 8701230..fb70160 100644
--- a/engines/bladerunner/script/ai/howie_lee.cpp
+++ b/engines/bladerunner/script/ai/howie_lee.cpp
@@ -203,6 +203,10 @@ void AIScriptHowieLee::EnteredScene(int sceneId) {
if ( Game_Flag_Query(kFlagCT04HomelessKilledByMcCoy)
&& !Game_Flag_Query(kFlagCT04HomelessBodyInDumpster)
&& !Game_Flag_Query(kFlagCT04HomelessBodyFound)
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+ && !Game_Flag_Query(kFlagCT04HomelessBodyThrownAway)
+#endif // BLADERUNNER_ORIGINAL_BUGS
) {
Game_Flag_Set(kFlagCT04HomelessBodyFound);
// return false;
@@ -211,6 +215,10 @@ void AIScriptHowieLee::EnteredScene(int sceneId) {
if (Game_Flag_Query(kFlagCT04HomelessKilledByMcCoy)
&& Game_Flag_Query(kFlagCT04HomelessBodyInDumpster)
&& !Game_Flag_Query(kFlagCT04HomelessBodyFound)
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+ && !Game_Flag_Query(kFlagCT04HomelessBodyThrownAway)
+#endif // BLADERUNNER_ORIGINAL_BUGS
&& Random_Query(1, 10) == 1
) {
Game_Flag_Set(kFlagCT04HomelessBodyFound);
diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp
index 9b5eec4..33c1b8e 100644
--- a/engines/bladerunner/script/ai/steele.cpp
+++ b/engines/bladerunner/script/ai/steele.cpp
@@ -448,6 +448,10 @@ void AIScriptSteele::EnteredScene(int sceneId) {
&& Actor_Query_In_Set(kActorSteele, kSetCT03_CT04)
&& Game_Flag_Query(kFlagCT04HomelessKilledByMcCoy)
&& !Game_Flag_Query(kFlagCT04HomelessBodyInDumpster)
+#if BLADERUNNER_ORIGINAL_BUGS
+#else
+ && !Game_Flag_Query(kFlagCT04HomelessBodyThrownAway)
+#endif // BLADERUNNER_ORIGINAL_BUGS
&& !Game_Flag_Query(kFlagCT04HomelessBodyFound)
) {
Game_Flag_Set(kFlagCT04HomelessBodyFound);
More information about the Scummvm-git-logs
mailing list