diff options
| author | Peter Kohaut | 2016-10-01 03:20:03 +0200 |
|---|---|---|
| committer | Peter Kohaut | 2016-10-01 03:20:03 +0200 |
| commit | fe2add5d5fb955724af9f0308d07c46c3110baad (patch) | |
| tree | f4a7f2d18dcb9c9a821e2bfc9e771c476b02797d /engines/bladerunner/script/ug16.cpp | |
| parent | 70c10f82430fcf9e8d523075563760b889c3bb83 (diff) | |
| download | scummvm-rg350-fe2add5d5fb955724af9f0308d07c46c3110baad.tar.gz scummvm-rg350-fe2add5d5fb955724af9f0308d07c46c3110baad.tar.bz2 scummvm-rg350-fe2add5d5fb955724af9f0308d07c46c3110baad.zip | |
BLADERUNNER: fixed endian issue in uncompressed audio (thx madmoose), fixed some warnings, fixed some scene scripts
Diffstat (limited to 'engines/bladerunner/script/ug16.cpp')
| -rw-r--r-- | engines/bladerunner/script/ug16.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/bladerunner/script/ug16.cpp b/engines/bladerunner/script/ug16.cpp index 379e0bb793..2a4a028c3d 100644 --- a/engines/bladerunner/script/ug16.cpp +++ b/engines/bladerunner/script/ug16.cpp @@ -98,19 +98,19 @@ bool ScriptUG16::ClickedOn3DObject(const char *objectName, bool a2) { } if (Object_Query_Click("SCREEN 01", objectName) && !Loop_Actor_Walk_To_XYZ(0, 194.0f, -35.0f, 160.8f, 0, 1, false, 0)) { Actor_Face_Heading(0, 870, false); - if (Game_Flag_Query(595) || !Actor_Query_Is_In_Current_Set(10) && !Actor_Clue_Query(0, 151) && !Game_Flag_Query(568)) { - Delay(2000); - Actor_Face_Heading(0, 1016, false); - Delay(2000); - Actor_Says(0, 5725, 14); - Delay(1000); - Item_Pickup_Spin_Effect(941, 418, 305); - Actor_Clue_Acquire(0, 151, 1, -1); - return true; + if ((!Game_Flag_Query(595) && Actor_Query_Is_In_Current_Set(10)) || Actor_Clue_Query(0, 151) || Game_Flag_Query(568)) { + Actor_Says(0, 8525, 12); + Actor_Says(0, 8526, 12); + return false; } - Actor_Says(0, 8525, 12); - Actor_Says(0, 8526, 12); - return false; + Delay(2000); + Actor_Face_Heading(0, 1016, false); + Delay(2000); + Actor_Says(0, 5725, 14); + Delay(1000); + Item_Pickup_Spin_Effect(941, 418, 305); + Actor_Clue_Acquire(0, 151, 1, -1); + return true; } return false; } |