diff options
| author | Peter Kohaut | 2019-01-13 20:38:17 +0100 |
|---|---|---|
| committer | Peter Kohaut | 2019-01-13 21:06:58 +0100 |
| commit | eb84113222562a3da2161ca7190cfd26a57f8080 (patch) | |
| tree | cbd5e8ab78fe12126e83edb4b5fabf617fb402a4 /engines/bladerunner/script/ai/steele.cpp | |
| parent | efbcc757b62461914121e4e00891361994d90643 (diff) | |
| download | scummvm-rg350-eb84113222562a3da2161ca7190cfd26a57f8080.tar.gz scummvm-rg350-eb84113222562a3da2161ca7190cfd26a57f8080.tar.bz2 scummvm-rg350-eb84113222562a3da2161ca7190cfd26a57f8080.zip | |
BLADERUNNER: More variable names in the game scripts
Diffstat (limited to 'engines/bladerunner/script/ai/steele.cpp')
| -rw-r--r-- | engines/bladerunner/script/ai/steele.cpp | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp index 9da49b259b..5420abd1b1 100644 --- a/engines/bladerunner/script/ai/steele.cpp +++ b/engines/bladerunner/script/ai/steele.cpp @@ -357,44 +357,43 @@ void AIScriptSteele::ClickedByPlayer() { void AIScriptSteele::EnteredScene(int sceneId) { if (Actor_Query_Goal_Number(kActorSteele) == 2) { - if (Game_Flag_Query(147) || Random_Query(1, 3) != 1) { - if (Game_Flag_Query(148) || Random_Query(1, 3) != 1) { - if (!Game_Flag_Query(149) && Random_Query(1, 20) == 1) { - Actor_Clue_Acquire(kActorSteele, 7, 1, -1); - Game_Flag_Set(149); - - if (Game_Flag_Query(709)) - Item_Remove_From_World(98); - } - } else { - Actor_Clue_Acquire(kActorSteele, 6, 1, -1); - Game_Flag_Set(148); - - if (Game_Flag_Query(709)) - Item_Remove_From_World(79); - } - } else { + if (!Game_Flag_Query(147) && Random_Query(1, 3) == 1) { Actor_Clue_Acquire(kActorSteele, 8, 1, -1); Game_Flag_Set(147); - if (Game_Flag_Query(709)) + if (Game_Flag_Query(709)) { Item_Remove_From_World(82); + } Global_Variable_Increment(14, 1); + } else if (!Game_Flag_Query(148) && Random_Query(1, 3) == 1) { + Actor_Clue_Acquire(kActorSteele, 6, 1, -1); + Game_Flag_Set(148); + + if (Game_Flag_Query(709)) { + Item_Remove_From_World(79); + } + } else if (!Game_Flag_Query(149) && Random_Query(1, 20) == 1) { + Actor_Clue_Acquire(kActorSteele, 7, 1, -1); + Game_Flag_Set(149); + + if (Game_Flag_Query(709)) { + Item_Remove_From_World(98); + } } } - if (Actor_Query_Goal_Number(kActorSteele) != 5 - || !Actor_Query_In_Set(kActorSteele, kSetCT03_CT04) - || !Game_Flag_Query(kFlagHomelessShot) - || Game_Flag_Query(170) - || Game_Flag_Query(171)) { - return; //false; + if ( Actor_Query_Goal_Number(kActorSteele) == 5 + && Actor_Query_In_Set(kActorSteele, kSetCT03_CT04) + && Game_Flag_Query(kFlagMcCoyKilledHomeless) + && !Game_Flag_Query(kFlagHomelessBodyInDumpster) + && !Game_Flag_Query(kFlagHomelessBodyFound) + ) { + Game_Flag_Set(kFlagHomelessBodyFound); + return; //true; } - Game_Flag_Set(171); - - return; //true; + return; //false; } void AIScriptSteele::OtherAgentEnteredThisScene(int otherActorId) { |