diff options
Diffstat (limited to 'engines/bladerunner/script/ai')
-rw-r--r-- | engines/bladerunner/script/ai/clovis.cpp | 2 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/dektora.cpp | 6 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/early_q.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/gordo.cpp | 2 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/izo.cpp | 2 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/leon.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/lucy.cpp | 2 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/luther.cpp | 2 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/maggie.cpp | 2 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/mccoy.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/rachael.cpp | 4 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/sadik.cpp | 8 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/shoeshine_man.cpp | 2 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/steele.cpp | 8 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/taffy_patron.cpp | 2 | ||||
-rw-r--r-- | engines/bladerunner/script/ai/zuben.cpp | 2 |
16 files changed, 28 insertions, 28 deletions
diff --git a/engines/bladerunner/script/ai/clovis.cpp b/engines/bladerunner/script/ai/clovis.cpp index b26df93697..4d476f4cab 100644 --- a/engines/bladerunner/script/ai/clovis.cpp +++ b/engines/bladerunner/script/ai/clovis.cpp @@ -195,7 +195,7 @@ void AIScriptClovis::Retired(int byActorId) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false); Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagKP07toKP06); diff --git a/engines/bladerunner/script/ai/dektora.cpp b/engines/bladerunner/script/ai/dektora.cpp index 94bdfe37e3..7764a975a6 100644 --- a/engines/bladerunner/script/ai/dektora.cpp +++ b/engines/bladerunner/script/ai/dektora.cpp @@ -90,7 +90,7 @@ bool AIScriptDektora::Update() { if (comp_distance(kActorMcCoy, _x, _y, _z) > 12.0f) { Actor_Query_XYZ(kActorMcCoy, &_x, &_y, &_z); - Async_Actor_Walk_To_XYZ(kActorDektora, _x, _y, _z, 36, 0); + Async_Actor_Walk_To_XYZ(kActorDektora, _x, _y, _z, 36, false); } break; @@ -309,7 +309,7 @@ void AIScriptDektora::Retired(int byActorId) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false); Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagKP07toKP06); @@ -489,7 +489,7 @@ bool AIScriptDektora::GoalChanged(int currentGoalNumber, int newGoalNumber) { case kGoalDektoraNR11Burning: Game_Flag_Set(kFlagNR11DektoraBurning); Actor_Set_Targetable(kActorDektora, true); - Loop_Actor_Walk_To_XYZ(kActorDektora, -135.0f, 0.33f, -267.0f, 0, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorDektora, -135.0f, 0.33f, -267.0f, 0, false, false, false); Actor_Face_Actor(kActorMcCoy, kActorDektora, true); if (Actor_Query_Goal_Number(kActorSteele) == kGoalSteeleNR11StopShooting) { Actor_Face_Actor(kActorSteele, kActorDektora, true); diff --git a/engines/bladerunner/script/ai/early_q.cpp b/engines/bladerunner/script/ai/early_q.cpp index a0f4983eb7..c566f4eb10 100644 --- a/engines/bladerunner/script/ai/early_q.cpp +++ b/engines/bladerunner/script/ai/early_q.cpp @@ -334,7 +334,7 @@ bool AIScriptEarlyQ::GoalChanged(int currentGoalNumber, int newGoalNumber) { break; case kGoalEarlyQNR04GoToMcCoy: - Loop_Actor_Walk_To_Actor(kActorEarlyQ, 0, 36, 0, 0); + Loop_Actor_Walk_To_Actor(kActorEarlyQ, 0, 36, false, false); AI_Countdown_Timer_Reset(kActorEarlyQ, kActorTimerAIScriptCustomTask0); AI_Countdown_Timer_Start(kActorEarlyQ, kActorTimerAIScriptCustomTask0, 4); break; @@ -353,7 +353,7 @@ bool AIScriptEarlyQ::GoalChanged(int currentGoalNumber, int newGoalNumber) { Actor_Says(kActorEarlyQ, 160, kAnimationModeTalk); Actor_Says(kActorMcCoy, 3410, kAnimationModeCombatAim); _vm->_aiScripts->callChangeAnimationMode(kActorMcCoy, kAnimationModeCombatIdle); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, 31.22f, 0.0f, 267.51f, 0, true, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, 31.22f, 0.0f, 267.51f, 0, true, false, false); Actor_Set_Goal_Number(kActorEarlyQ, kGoalEarlyQNR04SitDown); break; diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp index 87c9bdeb10..11afe3e532 100644 --- a/engines/bladerunner/script/ai/gordo.cpp +++ b/engines/bladerunner/script/ai/gordo.cpp @@ -297,7 +297,7 @@ void AIScriptGordo::Retired(int byActorId) { #if BLADERUNNER_ORIGINAL_BUGS Player_Gains_Control(); #endif // BLADERUNNER_ORIGINAL_BUGS - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false); Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagKP07toKP06); diff --git a/engines/bladerunner/script/ai/izo.cpp b/engines/bladerunner/script/ai/izo.cpp index 2fed274f50..9191ef18f5 100644 --- a/engines/bladerunner/script/ai/izo.cpp +++ b/engines/bladerunner/script/ai/izo.cpp @@ -245,7 +245,7 @@ void AIScriptIzo::Retired(int byActorId) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false); Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagKP07toKP06); diff --git a/engines/bladerunner/script/ai/leon.cpp b/engines/bladerunner/script/ai/leon.cpp index 94f3093ee5..6a3a1b92da 100644 --- a/engines/bladerunner/script/ai/leon.cpp +++ b/engines/bladerunner/script/ai/leon.cpp @@ -199,14 +199,14 @@ bool AIScriptLeon::GoalChanged(int currentGoalNumber, int newGoalNumber) { Actor_Says(kActorMcCoy, 505, 23); Actor_Says(kActorLeon, 60, 13); Player_Gains_Control(); - Loop_Actor_Walk_To_XYZ(kActorLeon, 233.0f, 349.0f, 849.0f, 0, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorLeon, 233.0f, 349.0f, 849.0f, 0, false, false, false); Actor_Face_Actor(kActorLeon, kActorMcCoy, true); Actor_Face_Actor(kActorMcCoy, kActorLeon, true); Actor_Says(kActorMcCoy, 515, 18); Actor_Says_With_Pause(kActorLeon, 70, 0.3f, 12); Actor_Says(kActorMcCoy, 520, 15); Actor_Says(kActorLeon, 80, 12); - Loop_Actor_Walk_To_XYZ(kActorLeon, 198.0f, 349.0f, 865.0f, 0, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorLeon, 198.0f, 349.0f, 865.0f, 0, false, false, false); Actor_Face_Actor(kActorLeon, kActorMcCoy, true); Actor_Face_Actor(kActorMcCoy, kActorLeon, true); if (Actor_Clue_Query(kActorMcCoy, kClueWantedPoster)) { // there is no way how to obtain this poster diff --git a/engines/bladerunner/script/ai/lucy.cpp b/engines/bladerunner/script/ai/lucy.cpp index b2084a52e3..37ae7b46e2 100644 --- a/engines/bladerunner/script/ai/lucy.cpp +++ b/engines/bladerunner/script/ai/lucy.cpp @@ -259,7 +259,7 @@ void AIScriptLucy::Retired(int byActorId) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false); Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagKP07toKP06); diff --git a/engines/bladerunner/script/ai/luther.cpp b/engines/bladerunner/script/ai/luther.cpp index 2298f40b02..694dc6d2b2 100644 --- a/engines/bladerunner/script/ai/luther.cpp +++ b/engines/bladerunner/script/ai/luther.cpp @@ -201,7 +201,7 @@ void AIScriptLuther::Retired(int byActorId) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false); Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagKP07toKP06); diff --git a/engines/bladerunner/script/ai/maggie.cpp b/engines/bladerunner/script/ai/maggie.cpp index 86a1c5f881..a31c5be76f 100644 --- a/engines/bladerunner/script/ai/maggie.cpp +++ b/engines/bladerunner/script/ai/maggie.cpp @@ -334,7 +334,7 @@ bool AIScriptMaggie::GoalChanged(int currentGoalNumber, int newGoalNumber) { case kGoalMaggieKP05McCoyEntred: Scene_Exits_Disable(); - Loop_Actor_Walk_To_XYZ(kActorMaggie, -734.0, 0.0, -432.0, 0, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMaggie, -734.0, 0.0, -432.0, 0, false, false, false); Actor_Face_Actor(kActorMaggie, kActorMcCoy, true); Actor_Change_Animation_Mode(kActorMaggie, 56); Actor_Face_Actor(kActorMcCoy, kActorMaggie, true); diff --git a/engines/bladerunner/script/ai/mccoy.cpp b/engines/bladerunner/script/ai/mccoy.cpp index d05266b1f3..145743f034 100644 --- a/engines/bladerunner/script/ai/mccoy.cpp +++ b/engines/bladerunner/script/ai/mccoy.cpp @@ -82,10 +82,10 @@ bool AIScriptMcCoy::Update() { case kGoalMcCoyNRxxStandUp: Actor_Set_Goal_Number(kActorMcCoy, kGoalMcCoyDefault); if (Player_Query_Current_Set() == kSetNR03) { - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -166.0f, -70.19f, -501.0f, 0, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -166.0f, -70.19f, -501.0f, 0, false, false, false); Actor_Face_Heading(kActorMcCoy, 300, false); } else { - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -461.0f, 0.0f, -373.0f, 0, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -461.0f, 0.0f, -373.0f, 0, false, false, false); } Player_Gains_Control(); return true; diff --git a/engines/bladerunner/script/ai/rachael.cpp b/engines/bladerunner/script/ai/rachael.cpp index 49baab4dee..63879b7f20 100644 --- a/engines/bladerunner/script/ai/rachael.cpp +++ b/engines/bladerunner/script/ai/rachael.cpp @@ -387,7 +387,7 @@ void AIScriptRachael::FledCombat() { void AIScriptRachael::dialogue_start() { if (_vm->_cutContent) { Actor_Face_Actor(kActorRachael, kActorMcCoy, true); - Loop_Actor_Walk_To_Actor(kActorRachael, kActorMcCoy, 84, 0, false); + Loop_Actor_Walk_To_Actor(kActorRachael, kActorMcCoy, 84, false, false); if(_vm->_cutContent) { Actor_Says(kActorMcCoy, 2735, 14); // MetAtYourUnclesOffice } @@ -402,7 +402,7 @@ void AIScriptRachael::dialogue_start() { Actor_Says(kActorRachael, 40, 15); // ThankYouForAsking } else { // original code -- un-triggered - Loop_Actor_Walk_To_Actor(kActorRachael, kActorMcCoy, 84, 0, false); + Loop_Actor_Walk_To_Actor(kActorRachael, kActorMcCoy, 84, false, false); Actor_Says(kActorRachael, 0, 15); // I remember you mr mcCoy Actor_Says(kActorMcCoy, 2740, 13); Actor_Says(kActorRachael, 10, 14); diff --git a/engines/bladerunner/script/ai/sadik.cpp b/engines/bladerunner/script/ai/sadik.cpp index 4dc36f85b9..0523e9f5b5 100644 --- a/engines/bladerunner/script/ai/sadik.cpp +++ b/engines/bladerunner/script/ai/sadik.cpp @@ -243,7 +243,7 @@ void AIScriptSadik::Retired(int byActorId) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false); Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagKP07toKP06); @@ -407,7 +407,7 @@ bool AIScriptSadik::GoalChanged(int currentGoalNumber, int newGoalNumber) { return true; case 413: - Loop_Actor_Walk_To_XYZ(kActorSadik, -1062.0f, 0.0f, 219.0f, 0, false, true, 0); + Loop_Actor_Walk_To_XYZ(kActorSadik, -1062.0f, 0.0f, 219.0f, 0, false, true, false); Actor_Set_Targetable(kActorSadik, true); Non_Player_Actor_Combat_Mode_On(kActorSadik, kActorCombatStateIdle, true, kActorMcCoy, 9, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, 0, -1, -1, 15, 300, false); Actor_Set_Goal_Number(kActorSadik, 450); @@ -447,14 +447,14 @@ bool AIScriptSadik::GoalChanged(int currentGoalNumber, int newGoalNumber) { return true; case kGoalSadikUG18NeedsReactorCoreFromMcCoy: - Loop_Actor_Walk_To_XYZ(kActorSadik, -961.0f, 0.0f, -778.0f, 0, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorSadik, -961.0f, 0.0f, -778.0f, 0, false, false, false); Actor_Face_Heading(kActorSadik, 150, false); return true; case 417: Actor_Face_Actor(kActorSadik, kActorMcCoy, true); Actor_Says(kActorSadik, 320, kAnimationModeTalk); - Loop_Actor_Walk_To_XYZ(kActorSadik, -857.0f, 0.0f, -703.0f, 0, false, true, 0); + Loop_Actor_Walk_To_XYZ(kActorSadik, -857.0f, 0.0f, -703.0f, 0, false, true, false); Actor_Says(kActorMcCoy, 2330, kAnimationModeTalk); Actor_Says(kActorSadik, 330, kAnimationModeTalk); Actor_Says(kActorMcCoy, 2335, kAnimationModeTalk); diff --git a/engines/bladerunner/script/ai/shoeshine_man.cpp b/engines/bladerunner/script/ai/shoeshine_man.cpp index 2f31c7f543..bd02c64957 100644 --- a/engines/bladerunner/script/ai/shoeshine_man.cpp +++ b/engines/bladerunner/script/ai/shoeshine_man.cpp @@ -58,7 +58,7 @@ void AIScriptShoeshineMan::ClickedByPlayer() { return; } - if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1098.15f, -0.04f, -201.53f, 0, true, false, 0)) { + if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1098.15f, -0.04f, -201.53f, 0, true, false, false)) { Actor_Set_Goal_Number(kActorShoeshineMan, 102); Actor_Face_Actor(kActorMcCoy, kActorShoeshineMan, true); Actor_Says_With_Pause(kActorShoeshineMan, 0, 1.2f, 13); diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp index 63b94749fd..9b5eec4b3b 100644 --- a/engines/bladerunner/script/ai/steele.cpp +++ b/engines/bladerunner/script/ai/steele.cpp @@ -326,7 +326,7 @@ void AIScriptSteele::CompletedMovementTrack() { Actor_Says(kActorSteele, 670, 59); Actor_Set_Goal_Number(kActorSteele, kGoalSteeleKP06Leave); Player_Set_Combat_Mode(kActorSteele); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -731.0f, 8.26f, -657.0f, 0, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -731.0f, 8.26f, -657.0f, 0, false, false, false); Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagKP06toKP07); @@ -667,7 +667,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) { return true; case kGoalSteeleLeaveTB02: - Loop_Actor_Walk_To_XYZ(kActorSteele, -187.82f, 0.08f, 1460.74f, 0, 0, 0, 0); + Loop_Actor_Walk_To_XYZ(kActorSteele, -187.82f, 0.08f, 1460.74f, 0, false, false, false); Actor_Face_Heading(kActorSteele, 802, false); Loop_Actor_Travel_Stairs(kActorSteele, 10, false, kAnimationModeIdle); AI_Movement_Track_Flush(kActorSteele); @@ -863,7 +863,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) { case kGoalSteeleNR11Enter: if (comp_distance(kActorMcCoy, -4.0, 0.33f, 0.0f, 100.0f, 0.33f, -4.0f) < 48.0f) { - Loop_Actor_Walk_To_XYZ(kActorMcCoy, 32.0f, 0.33f, 17.0f, 0, false, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, 32.0f, 0.33f, 17.0f, 0, false, false, false); } AI_Countdown_Timer_Reset(kActorSteele, kActorTimerAIScriptCustomTask0); Player_Loses_Control(); @@ -1287,7 +1287,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) { return true; case kGoalSteeleNR01StartChapter4: - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -281.0f, 31.93f, -1061.0f, 0, false, true, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -281.0f, 31.93f, -1061.0f, 0, false, true, false); Actor_Face_Heading(kActorMcCoy, 45, false); Loop_Actor_Travel_Stairs(kActorMcCoy, 3, false, kAnimationModeIdle); Global_Variable_Set(kVariableChapter, 4); diff --git a/engines/bladerunner/script/ai/taffy_patron.cpp b/engines/bladerunner/script/ai/taffy_patron.cpp index 975aa1df91..fad4d9c2bc 100644 --- a/engines/bladerunner/script/ai/taffy_patron.cpp +++ b/engines/bladerunner/script/ai/taffy_patron.cpp @@ -96,7 +96,7 @@ bool AIScriptTaffyPatron::GoalChanged(int currentGoalNumber, int newGoalNumber) case 250: Actor_Put_In_Set(kActorTaffyPatron, kSetNR01); Actor_Set_At_XYZ(kActorTaffyPatron, -170.4f, 23.68f, -850.0f, 324); - Async_Actor_Walk_To_XYZ(kActorTaffyPatron, -390.0f, 31.55f, -429.0f, 24, 1); + Async_Actor_Walk_To_XYZ(kActorTaffyPatron, -390.0f, 31.55f, -429.0f, 24, true); return true; case 255: diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp index 8ead224a65..7cde5456a8 100644 --- a/engines/bladerunner/script/ai/zuben.cpp +++ b/engines/bladerunner/script/ai/zuben.cpp @@ -301,7 +301,7 @@ void AIScriptZuben::Retired(int byActorId) { Player_Loses_Control(); Delay(2000); Player_Set_Combat_Mode(false); - Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, 0); + Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, true, false, false); Ambient_Sounds_Remove_All_Non_Looping_Sounds(true); Ambient_Sounds_Remove_All_Looping_Sounds(1); Game_Flag_Set(kFlagKP07toKP06); |