diff options
Diffstat (limited to 'engines/bladerunner/script')
| -rw-r--r-- | engines/bladerunner/script/ai/zuben.cpp | 8 | ||||
| -rw-r--r-- | engines/bladerunner/script/scene/ma04.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp index 9b99e2c400..da4091787d 100644 --- a/engines/bladerunner/script/ai/zuben.cpp +++ b/engines/bladerunner/script/ai/zuben.cpp @@ -46,7 +46,7 @@ void AIScriptZuben::Initialize() { } bool AIScriptZuben::Update() { - if (Actor_Query_Goal_Number(kActorZuben) == 599 && Actor_Query_Which_Set_In(kActorZuben) != kSetFreeSlotI) { + if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDead && Actor_Query_Which_Set_In(kActorZuben) != kSetFreeSlotI) { if (Actor_Query_Which_Set_In(kActorZuben) != Player_Query_Current_Set() ) { Actor_Put_In_Set(kActorZuben, kSetFreeSlotI); Actor_Set_At_Waypoint(kActorZuben, 41, 0); @@ -173,7 +173,7 @@ void AIScriptZuben::ReceivedClue(int clueId, int fromActorId) { } void AIScriptZuben::ClickedByPlayer() { - if (Actor_Query_Goal_Number(kActorZuben) == 599) { + if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDead) { if (Player_Query_Current_Scene() == kSceneCT06) { // return true; return; @@ -253,7 +253,7 @@ void AIScriptZuben::Retired(int byActorId) { return; } Global_Variable_Decrement(51, 1); - Actor_Set_Goal_Number(kActorZuben, 599); + Actor_Set_Goal_Number(kActorZuben, kGoalZubenDead); if (Global_Variable_Query(51)) { // return false; return; @@ -332,7 +332,7 @@ bool AIScriptZuben::GoalChanged(int currentGoalNumber, int newGoalNumber) { Player_Set_Combat_Mode(false); Actor_Set_Goal_Number(kActorGaff, 3); } - Actor_Set_Goal_Number(kActorZuben, 599); + Actor_Set_Goal_Number(kActorZuben, kGoalZubenDead); return false; case kGoalZubenCT02PushPot: _animationFrame = 0; diff --git a/engines/bladerunner/script/scene/ma04.cpp b/engines/bladerunner/script/scene/ma04.cpp index ead9f1946d..0b2643149b 100644 --- a/engines/bladerunner/script/scene/ma04.cpp +++ b/engines/bladerunner/script/scene/ma04.cpp @@ -564,8 +564,8 @@ void SceneScriptMA04::sleep() { Player_Loses_Control(); Game_Flag_Set(kFlagMcCoySleeping); if ((Game_Flag_Query(kFlagZubenRetired) || Game_Flag_Query(kFlagZubenSpared)) && Global_Variable_Query(kVariableChapter) == 1) { - if (Actor_Query_Goal_Number(kActorZuben) == 599) { - Actor_Put_In_Set(kActorZuben, 91); + if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenDead) { + Actor_Put_In_Set(kActorZuben, kSetFreeSlotA); Actor_Set_At_Waypoint(kActorZuben, 33, 0); } Game_Flag_Set(kFlagChapter2Intro); |