From e3e33124539c6ba7bbe426a5af66873762191d37 Mon Sep 17 00:00:00 2001 From: Thanasis Antoniou Date: Wed, 12 Jun 2019 15:05:22 +0300 Subject: BLADERUNNER: Remove debug comments for Police Officers Code will be revisited at a later point based on public testing feedback --- engines/bladerunner/script/ai/officer_grayford.cpp | 18 +++++++----------- engines/bladerunner/script/ai/officer_leary.cpp | 14 +++++--------- 2 files changed, 12 insertions(+), 20 deletions(-) (limited to 'engines/bladerunner/script/ai') diff --git a/engines/bladerunner/script/ai/officer_grayford.cpp b/engines/bladerunner/script/ai/officer_grayford.cpp index 1dcbf72e6b..d7bf65c650 100644 --- a/engines/bladerunner/script/ai/officer_grayford.cpp +++ b/engines/bladerunner/script/ai/officer_grayford.cpp @@ -113,7 +113,6 @@ bool AIScriptOfficerGrayford::Update() { switch (Actor_Query_Which_Set_In(kActorOfficerGrayford)) { case kSetRC03: if (Actor_Query_Which_Set_In(kActorOfficerGrayford) == Player_Query_Current_Set()) { -// asdf restore Actor_Set_Goal_Number(kActorOfficerGrayford, kGoalOfficerGrayfordAttackMcCoyAct4); Non_Player_Actor_Combat_Mode_On(kActorOfficerGrayford, kActorCombatStateIdle, true, kActorMcCoy, 18, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, -1, -1, -1, 10, 300, false); } @@ -136,14 +135,14 @@ bool AIScriptOfficerGrayford::Update() { Non_Player_Actor_Combat_Mode_On(kActorOfficerGrayford, kActorCombatStateIdle, true, kActorMcCoy, 10, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, -1, -1, -1, 10, 300, false); } break; -// asdf missing UG07 case - would be a type 10 combat, 12 flee? +// TODO missing UG07 case - would be a type 10 combat, 12 flee? case kSetUG08: if (Actor_Query_Which_Set_In(kActorOfficerGrayford) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerGrayford, kGoalOfficerGrayfordAttackMcCoyAct4); Non_Player_Actor_Combat_Mode_On(kActorOfficerGrayford, kActorCombatStateIdle, true, kActorMcCoy, 13, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, -1, -1, -1, 10, 300, false); } break; -// asdf missing UG09 case - would be a type ?? // +// TODO missing UG09 case - would be a type ?? // case kSetUG10: if (Actor_Query_Which_Set_In(kActorOfficerGrayford) == Player_Query_Current_Set()) { @@ -331,7 +330,7 @@ void AIScriptOfficerGrayford::ClickedByPlayer() { if (Random_Query(1, 2) == 1) { Actor_Says(kActorMcCoy, 5075, 14); // Hey, pal. } else { - Actor_Says(kActorMcCoy, 5075, 14); // Hey, pal. TODO asdf bug in the original? Matches the above statement + Actor_Says(kActorMcCoy, 5075, 14); // Hey, pal. TODO bug in the original? Matches the above statement } Actor_Set_Goal_Number(kActorOfficerGrayford, kGoalOfficerGrayfordWalksInPS03c); break; @@ -359,7 +358,7 @@ void AIScriptOfficerGrayford::ClickedByPlayer() { Actor_Says(kActorOfficerGrayford, 330, 13); Actor_Set_Goal_Number(kActorOfficerGrayford, kGoalOfficerGrayfordWalksInPS09b); break; -// asdf goals 6 and 9? +// TODO goals 6 and 9? case kGoalOfficerGrayfordWalksInPS09c: AI_Movement_Track_Flush(kActorOfficerGrayford); Actor_Set_Goal_Number(kActorOfficerGrayford, kGoalOfficerGrayfordStopAndTalk1); @@ -619,8 +618,7 @@ bool AIScriptOfficerGrayford::GoalChanged(int currentGoalNumber, int newGoalNumb case kGoalOfficerGrayfordHuntingAroundAct4: // debug("Flushing Grayford movement track"); AI_Movement_Track_Flush(kActorOfficerGrayford); - switch (Random_Query(1, 10)) { // asdf restore -// switch (1) { + switch (Random_Query(1, 10)) { case 1: // kSetNR01 // debug("gray 1 kSetNR01"); @@ -719,8 +717,7 @@ bool AIScriptOfficerGrayford::GoalChanged(int currentGoalNumber, int newGoalNumb #endif // BLADERUNNER_ORIGINAL_BUGS case 8: - switch (Random_Query(1, 7)) { // asdf restore -// switch (1) { + switch (Random_Query(1, 7)) { case 1: // kSetUG10 -> kSetFreeSlotC // debug("gray 8-1 kSetUG10 -> kSetFreeSlotC"); @@ -801,8 +798,7 @@ bool AIScriptOfficerGrayford::GoalChanged(int currentGoalNumber, int newGoalNumb return false; // does it matter if false or true? case 9 and 10 return false #endif // BLADERUNNER_ORIGINAL_BUGS case 9: - if (Random_Query(0, 1)) { // asdf restore -// if (1) { + if (Random_Query(0, 1)) { // kSetUG09 -> kSetFreeSlotC // debug("gray 9-1 kSetUG09 -> kSetFreeSlotC"); AI_Movement_Track_Append(kActorOfficerGrayford, 433, 10); diff --git a/engines/bladerunner/script/ai/officer_leary.cpp b/engines/bladerunner/script/ai/officer_leary.cpp index 169e5b4146..1f660146f7 100644 --- a/engines/bladerunner/script/ai/officer_leary.cpp +++ b/engines/bladerunner/script/ai/officer_leary.cpp @@ -122,7 +122,6 @@ bool AIScriptOfficerLeary::Update() { switch (Actor_Query_Which_Set_In(kActorOfficerLeary)) { case kSetDR01_DR02_DR04: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { -// asdf restore Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyAttackMcCoyAct4); Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, kActorCombatStateIdle, true, kActorMcCoy, 0, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, -1, -1, -1, 10, 300, false); } @@ -171,14 +170,14 @@ bool AIScriptOfficerLeary::Update() { Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, kActorCombatStateIdle, true, kActorMcCoy, 10, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, -1, -1, -1, 10, 300, false); } break; -// asdf Missing UG07 case - would be a type 10 combat, 12 flee? +// TODO Missing UG07 case - would be a type 10 combat, 12 flee? case kSetUG08: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyAttackMcCoyAct4); Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, kActorCombatStateIdle, true, kActorMcCoy, 13, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, -1, -1, -1, 10, 300, false); } break; -// asdf Missing UG09 case - would be a type ?? // +// TODO Missing UG09 case - would be a type ?? // case kSetUG10: if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) { Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyAttackMcCoyAct4); @@ -385,8 +384,7 @@ bool AIScriptOfficerLeary::GoalChanged(int currentGoalNumber, int newGoalNumber) case kGoalOfficerLearyHuntingAroundAct4: // debug("Flushing Leary movement track"); AI_Movement_Track_Flush(kActorOfficerLeary); - switch (Random_Query(1, 10)) { // asdf restore -// switch (1) { + switch (Random_Query(1, 10)) { case 1: // kSetNR01 // debug("leary 1 kSetNR01"); @@ -472,8 +470,7 @@ bool AIScriptOfficerLeary::GoalChanged(int currentGoalNumber, int newGoalNumber) break; #endif // BLADERUNNER_ORIGINAL_BUGS case 8: - switch (Random_Query(1, 7)) { // asdf restore -// switch (1) { + switch (Random_Query(1, 7)) { case 1: // kSetUG10 -> kSetFreeSlotC // debug("leary 8-1 kSetUG10 -> kSetFreeSlotC"); @@ -548,8 +545,7 @@ bool AIScriptOfficerLeary::GoalChanged(int currentGoalNumber, int newGoalNumber) break; #endif // BLADERUNNER_ORIGINAL_BUGS case 9: - if (Random_Query(1, 2) == 2) { // asdf restore -// if (1) { + if (Random_Query(1, 2) == 2) { // kSetUG09 -> kSetFreeSlotC // debug("leary 9-2 kSetUG09 -> kSetFreeSlotC"); AI_Movement_Track_Append(kActorOfficerLeary, 433, 10); -- cgit v1.2.3