diff options
| author | Peter Kohaut | 2019-01-24 22:57:41 +0100 |
|---|---|---|
| committer | Peter Kohaut | 2019-01-24 23:05:13 +0100 |
| commit | 2cc09b6b1097007b6eeac12882c03475e56e1be0 (patch) | |
| tree | 777e076f39c4c7dd246342cfe15b3321076b8c6b /engines/bladerunner/script/ai/howie_lee.cpp | |
| parent | 2fd29c5193a0b9e6d3920f0512ce3ca37b00bf7e (diff) | |
| download | scummvm-rg350-2cc09b6b1097007b6eeac12882c03475e56e1be0.tar.gz scummvm-rg350-2cc09b6b1097007b6eeac12882c03475e56e1be0.tar.bz2 scummvm-rg350-2cc09b6b1097007b6eeac12882c03475e56e1be0.zip | |
BLADERUNNER: Fixes for game scripts & cleanup
Diffstat (limited to 'engines/bladerunner/script/ai/howie_lee.cpp')
| -rw-r--r-- | engines/bladerunner/script/ai/howie_lee.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/bladerunner/script/ai/howie_lee.cpp b/engines/bladerunner/script/ai/howie_lee.cpp index 2291d5ac12..93f08672db 100644 --- a/engines/bladerunner/script/ai/howie_lee.cpp +++ b/engines/bladerunner/script/ai/howie_lee.cpp @@ -55,7 +55,7 @@ bool AIScriptHowieLee::Update() { Actor_Set_Goal_Number(kActorHowieLee, 1); } - if ( Game_Flag_Query(kFlagMcCoyAtCTxx) + if ( Game_Flag_Query(kFlagMcCoyInChinaTown) && !Actor_Query_In_Set(kActorHowieLee, kSetCT01_CT12) ) { AI_Movement_Track_Flush(kActorHowieLee); @@ -64,8 +64,8 @@ bool AIScriptHowieLee::Update() { } if ( Actor_Query_Goal_Number(kActorHowieLee) == 1 - && Game_Flag_Query(kFlagBoughtHowieLeeFood) - && !Game_Flag_Query(kFlagMcCoyAtCTxx) + && Game_Flag_Query(kFlagCT01BoughtHowieLeeFood) + && !Game_Flag_Query(kFlagMcCoyInChinaTown) ) { Actor_Set_Goal_Number(kActorHowieLee, 4); return true; @@ -124,20 +124,20 @@ void AIScriptHowieLee::EnteredScene(int sceneId) { if (Actor_Query_Goal_Number(kActorHowieLee) == 4 && Actor_Query_In_Set(kActorHowieLee, kSetCT03_CT04) ) { - if ( Game_Flag_Query(kFlagMcCoyKilledHomeless) - && !Game_Flag_Query(kFlagHomelessBodyInDumpster) - && !Game_Flag_Query(kFlagHomelessBodyFound) + if ( Game_Flag_Query(kFlagCT04HomelessKilledByMcCoy) + && !Game_Flag_Query(kFlagCT04HomelessBodyInDumpster) + && !Game_Flag_Query(kFlagCT04HomelessBodyFound) ) { - Game_Flag_Set(kFlagHomelessBodyFound); + Game_Flag_Set(kFlagCT04HomelessBodyFound); // return false; } - if (!Game_Flag_Query(kFlagMcCoyKilledHomeless) - && Game_Flag_Query(kFlagHomelessBodyInDumpster) - && !Game_Flag_Query(kFlagHomelessBodyFound) + if (!Game_Flag_Query(kFlagCT04HomelessKilledByMcCoy) + && Game_Flag_Query(kFlagCT04HomelessBodyInDumpster) + && !Game_Flag_Query(kFlagCT04HomelessBodyFound) && Random_Query(1, 10) == 1 ) { - Game_Flag_Set(kFlagHomelessBodyFound); + Game_Flag_Set(kFlagCT04HomelessBodyFound); // return true; } // return false; |