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/kp03.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/kp03.cpp')
| -rw-r--r-- | engines/bladerunner/script/kp03.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/bladerunner/script/kp03.cpp b/engines/bladerunner/script/kp03.cpp index a037ff63e5..57a1eb521b 100644 --- a/engines/bladerunner/script/kp03.cpp +++ b/engines/bladerunner/script/kp03.cpp @@ -46,7 +46,7 @@ void ScriptKP03::InitializeScene() { Scene_Loop_Set_Default(2); Game_Flag_Set(421); } - if (Actor_Query_Goal_Number(1) != 599 && !Game_Flag_Query(422) && !Game_Flag_Query(484) && (Game_Flag_Query(653) && Game_Flag_Query(420) || !Game_Flag_Query(653) && Game_Flag_Query(417))) { + if ((Actor_Query_Goal_Number(1) != 599 && !Game_Flag_Query(422) && !Game_Flag_Query(484)) && ((Game_Flag_Query(653) && Game_Flag_Query(420)) || (!Game_Flag_Query(653) && Game_Flag_Query(417)))) { Actor_Put_In_Set(1, 46); Actor_Set_At_XYZ(1, -300.0f, -36.55f, 26.0f, 350); } @@ -162,17 +162,17 @@ void ScriptKP03::SceneFrameAdvanced(int frame) { v1 = -1; if (!Game_Flag_Query(422)) { Actor_Query_XYZ(0, &x, &y, &z); - if (Game_Flag_Query(417) && -130.0f < x || Game_Flag_Query(420) && -130.0f > x) { + if ((Game_Flag_Query(417) && -130.0f < x) || (Game_Flag_Query(420) && -130.0f > x)) { v1 = 0; } } if (!Game_Flag_Query(422)) { //todo ? same condition as before Actor_Query_XYZ(1, &x, &y, &z); if (Game_Flag_Query(653) && Actor_Query_Which_Set_In(1) == 46) { - if (Game_Flag_Query(417) && -130.0f > x || Game_Flag_Query(420) && -130.0f < x) { + if ((Game_Flag_Query(417) && -130.0f > x) || (Game_Flag_Query(420) && -130.0f < x)) { v1 = 1; } - } else if (Game_Flag_Query(417) && -130.0f < x || Game_Flag_Query(420) && -130.0f > x) { + } else if ((Game_Flag_Query(417) && -130.0f < x) || (Game_Flag_Query(420) && -130.0f > x)) { v1 = 1; } } |