diff options
| author | Peter Kohaut | 2019-01-19 23:12:45 +0100 |
|---|---|---|
| committer | Peter Kohaut | 2019-01-19 23:15:41 +0100 |
| commit | 5e2fb6fb2672137f9dbcf6f17b8de9c312b236e6 (patch) | |
| tree | 3ec28e49d9f51e6c40df9c5a0f2da35080d65905 /engines/bladerunner/script/scene/dr03.cpp | |
| parent | f7754012dd1766959aaf4eca8ad3028afab5d7d0 (diff) | |
| download | scummvm-rg350-5e2fb6fb2672137f9dbcf6f17b8de9c312b236e6.tar.gz scummvm-rg350-5e2fb6fb2672137f9dbcf6f17b8de9c312b236e6.tar.bz2 scummvm-rg350-5e2fb6fb2672137f9dbcf6f17b8de9c312b236e6.zip | |
BLADERUNNER: More variable names in the game scripts
Fixed some errors as well
Diffstat (limited to 'engines/bladerunner/script/scene/dr03.cpp')
| -rw-r--r-- | engines/bladerunner/script/scene/dr03.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/engines/bladerunner/script/scene/dr03.cpp b/engines/bladerunner/script/scene/dr03.cpp index 2fa1f35974..f012c68ea5 100644 --- a/engines/bladerunner/script/scene/dr03.cpp +++ b/engines/bladerunner/script/scene/dr03.cpp @@ -59,21 +59,22 @@ bool SceneScriptDR03::ClickedOn3DObject(const char *objectName, bool a2) { } bool SceneScriptDR03::ClickedOnActor(int actorId) { - if (actorId == 52) { + if (actorId == kActorChew) { Actor_Face_Actor(kActorMcCoy, kActorChew, true); Actor_Face_Actor(kActorChew, kActorMcCoy, true); - if (!Game_Flag_Query(267)) { + if (!Game_Flag_Query(kFlagDR03ChewTalk1)) { Actor_Says(kActorMcCoy, 755, 18); Actor_Says(kActorChew, 10, 14); Actor_Says(kActorMcCoy, 760, 18); Actor_Says(kActorChew, 20, 14); Actor_Says(kActorMcCoy, 765, 18); Actor_Says(kActorChew, 30, 14); - Game_Flag_Set(267); + Game_Flag_Set(kFlagDR03ChewTalk1); return true; } if (Actor_Clue_Query(kActorMcCoy, kClueChewInterview)) { - if (Game_Flag_Query(266) && Game_Flag_Query(267)) { + if (Game_Flag_Query(kFlagMorajiExploded) + && Game_Flag_Query(kFlagDR03ChewTalk1)) { Actor_Says(kActorMcCoy, 815, 18); Actor_Says(kActorChew, 60, 14); Actor_Says(kActorChew, 70, 14); @@ -82,7 +83,7 @@ bool SceneScriptDR03::ClickedOnActor(int actorId) { Actor_Says(kActorChew, 90, 14); Actor_Says(kActorMcCoy, 825, 18); Actor_Says(kActorChew, 100, 14); - Game_Flag_Reset(266); + Game_Flag_Reset(kFlagMorajiExploded); Game_Flag_Set(505); return true; } @@ -114,7 +115,7 @@ bool SceneScriptDR03::ClickedOnActor(int actorId) { Actor_Says(kActorMcCoy, 855, 18); Actor_Says(kActorChew, 210, 12); } - Actor_Clue_Acquire(kActorMcCoy, kClueChewInterview, 1, kActorChew); + Actor_Clue_Acquire(kActorMcCoy, kClueChewInterview, true, kActorChew); return true; } return false; @@ -216,7 +217,7 @@ void SceneScriptDR03::sub_401B18() { Actor_Says(kActorMcCoy, 855, 18); Actor_Says(kActorChew, 210, 12); } - Actor_Clue_Acquire(kActorMcCoy, kClueChewInterview, 1, kActorChew); + Actor_Clue_Acquire(kActorMcCoy, kClueChewInterview, true, kActorChew); break; case 650: Actor_Says(kActorMcCoy, 775, 11); @@ -239,11 +240,11 @@ void SceneScriptDR03::sub_401B18() { Actor_Says(kActorChew, 280, 12); Actor_Says(kActorMcCoy, 870, 18); Actor_Says(kActorChew, 290, 15); - if (!Game_Flag_Query(266)) { + if (!Game_Flag_Query(kFlagMorajiExploded)) { Actor_Says(kActorChew, 300, 12); } } - Actor_Clue_Acquire(kActorMcCoy, kClueChewInterview, 1, kActorChew); + Actor_Clue_Acquire(kActorMcCoy, kClueChewInterview, true, kActorChew); break; case 670: Actor_Says(kActorMcCoy, 765, 12); |