diff options
author | Thanasis Antoniou | 2019-05-09 15:15:33 +0300 |
---|---|---|
committer | Thanasis Antoniou | 2019-05-09 15:15:33 +0300 |
commit | 074baf9b26fcb4efac67b71bea7bf0f979bb7a8f (patch) | |
tree | 889b4c7ba178889ee8f58a4c898fb42005858f91 /engines/bladerunner/script/scene/nr07.cpp | |
parent | 6e84264735986f165b6fe1cf8793337efb1d7875 (diff) | |
download | scummvm-rg350-074baf9b26fcb4efac67b71bea7bf0f979bb7a8f.tar.gz scummvm-rg350-074baf9b26fcb4efac67b71bea7bf0f979bb7a8f.tar.bz2 scummvm-rg350-074baf9b26fcb4efac67b71bea7bf0f979bb7a8f.zip |
BLADERUNNER: Use booleans in walk functions
And a few more (not all yet) methods that had 1, 0 instead of true, false
Diffstat (limited to 'engines/bladerunner/script/scene/nr07.cpp')
-rw-r--r-- | engines/bladerunner/script/scene/nr07.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/bladerunner/script/scene/nr07.cpp b/engines/bladerunner/script/scene/nr07.cpp index e0984b4309..0481cf0399 100644 --- a/engines/bladerunner/script/scene/nr07.cpp +++ b/engines/bladerunner/script/scene/nr07.cpp @@ -130,7 +130,7 @@ bool SceneScriptNR07::ClickedOnItem(int itemId, bool a2) { bool SceneScriptNR07::ClickedOnExit(int exitId) { if (exitId == 0) { - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -102.0f, -73.5f, -233.0f, 0, true, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -102.0f, -73.5f, -233.0f, 0, true, false, false)) { Actor_Set_Goal_Number(kActorHanoi, kGoalHanoiResetTimer); Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); @@ -153,7 +153,7 @@ void SceneScriptNR07::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo } void SceneScriptNR07::PlayerWalkedIn() { - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -110.0f, -73.5f, -169.0f, 0, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -110.0f, -73.5f, -169.0f, 0, false, false, false); if (Actor_Query_In_Set(kActorDektora, kSetNR07)) { if (!Game_Flag_Query(kFlagNR07Entered)) { @@ -171,7 +171,7 @@ void SceneScriptNR07::PlayerWalkedIn() { Actor_Says(kActorMcCoy, 3585, 14); Actor_Says(kActorDektora, 510, 30); Actor_Start_Speech_Sample(kActorMcCoy, 3590); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -112.0f, -73.0f, -89.0f, 525, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -112.0f, -73.0f, -89.0f, 525, false, false, false); Actor_Says(kActorDektora, 520, kAnimationModeSit); } else { Actor_Modify_Friendliness_To_Other(kActorDektora, kActorMcCoy, -2); @@ -195,7 +195,7 @@ void SceneScriptNR07::dektoraRunAway() { Actor_Set_At_XYZ(kActorDektora, -136.0f, -73.0f, -18.0f, 300); Actor_Change_Animation_Mode(kActorDektora, 71); Actor_Change_Animation_Mode(kActorMcCoy, 21); - Loop_Actor_Walk_To_XYZ(kActorDektora, -102.0f, -73.5f, -233.0f, 0, false, true, 0); + Loop_Actor_Walk_To_XYZ(kActorDektora, -102.0f, -73.5f, -233.0f, 0, false, true, false); if (Game_Flag_Query(kFlagDektoraIsReplicant)) { Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR08ReadyToRun); @@ -233,7 +233,7 @@ void SceneScriptNR07::callHolloway() { } void SceneScriptNR07::clickedOnVase() { - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, false, false, false); Actor_Face_Object(kActorMcCoy, "VASE", true); if (Actor_Query_Is_In_Current_Set(kActorDektora)) { if (!Actor_Clue_Query(kActorMcCoy, kClueDektoraInterview3)) { @@ -284,7 +284,7 @@ void SceneScriptNR07::talkAboutBelt1() { Actor_Says_With_Pause(kActorDektora, 590, 1.0f, 30); Actor_Says(kActorDektora, 600, 30); Actor_Start_Speech_Sample(kActorMcCoy, 3640); // Tell you the truth, I'm from the LPD. (...) - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, false, false, false); Actor_Face_Actor(kActorMcCoy, kActorDektora, true); Actor_Face_Actor(kActorDektora, kActorMcCoy, true); @@ -337,7 +337,7 @@ void SceneScriptNR07::talkAboutBelt2() { void SceneScriptNR07::talkAboutVoightKampff() { Actor_Clue_Acquire(kActorMcCoy, kClueDektoraInterview1, true, -1); Actor_Start_Speech_Sample(kActorMcCoy, 3660); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, 0, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, false, false, false); Actor_Face_Actor(kActorMcCoy, kActorDektora, true); Actor_Says(kActorDektora, 650, 30); Actor_Says(kActorDektora, 660, 31); @@ -366,7 +366,7 @@ void SceneScriptNR07::talkAboutVoightKampff() { void SceneScriptNR07::talkAboutSteele() { Actor_Says(kActorMcCoy, 3690, 14); Actor_Start_Speech_Sample(kActorDektora, 750); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, false, false, false); Actor_Face_Actor(kActorMcCoy, kActorDektora, true); Actor_Face_Actor(kActorDektora, kActorMcCoy, true); Actor_Says(kActorMcCoy, 3695, 15); @@ -392,7 +392,7 @@ void SceneScriptNR07::talkAboutMoonbus() { } else { Actor_Modify_Friendliness_To_Other(kActorDektora, kActorMcCoy, -3); Actor_Start_Speech_Sample(kActorMcCoy, 3710); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, false, false, false); Actor_Face_Actor(kActorMcCoy, kActorDektora, true); dektoraRunAway(); } |