From a14dffbf4b8c7ba51e4c801cc49584dc974864dc Mon Sep 17 00:00:00 2001 From: Thanasis Antoniou Date: Mon, 13 May 2019 10:26:00 +0300 Subject: BLADERUNNER: fix for homeless found cases --- engines/bladerunner/script/ai/howie_lee.cpp | 8 ++++++++ engines/bladerunner/script/ai/steele.cpp | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/engines/bladerunner/script/ai/howie_lee.cpp b/engines/bladerunner/script/ai/howie_lee.cpp index 87012302b2..fb70160b8e 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 9b5eec4b3b..33c1b8ee8b 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); -- cgit v1.2.3