aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/bladerunner/game_constants.h24
-rw-r--r--engines/bladerunner/script/ai/holloway.cpp2
-rw-r--r--engines/bladerunner/script/ai/lucy.cpp10
-rw-r--r--engines/bladerunner/script/ai/steele.cpp180
-rw-r--r--engines/bladerunner/script/scene/hf01.cpp6
-rw-r--r--engines/bladerunner/script/scene/hf02.cpp16
-rw-r--r--engines/bladerunner/script/scene/hf03.cpp2
-rw-r--r--engines/bladerunner/script/scene/nr01.cpp8
-rw-r--r--engines/bladerunner/script/scene/ug06.cpp4
9 files changed, 141 insertions, 111 deletions
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index be779417fa..2096a6261c 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -922,6 +922,8 @@ enum Flags {
kFlagTB07toTB02 = 608,
kFlagTB07RachaelTalk = 612,
kFlagHF03LucyTalk = 613,
+ kFlagMcCoyCapturedByBaker = 616,
+ kFlagSpinnerMissing = 617,
kFlagTB07TyrellMeeting = 625,
kFlagCT11DogWrapperTaken = 645,
kFlagMA04McCoySleeping = 647,
@@ -934,6 +936,7 @@ enum Flags {
kFlagPS14toMA07 = 673,
kFlagChapter2Intro = 678,
kFlagChapter3Intro = 679,
+ kFlagChapter4Intro = 680,
kFlagNotUsed686 = 686,
kFlagPS05TV0 = 688,
kFlagPS05TV1 = 689,
@@ -979,7 +982,7 @@ enum Variables {
kVariableWalkLoopActor = 37,
kVariableWalkLoopRun = 38,
kVariableDR06MannequinHeadOpened = 39,
- kVariableBehavior = 40, // 1 dektora is replicant, 2 - ?, 3 - get caught by Baker
+ kVariableBehavior = 40, // 1 dektora is replicant, 2 - ?, 3 - get caught by Holloway & Baker at HF03
kVariableMcCoyDrinks = 42, // is never checked
kVariableAffectionTowards = 45, // 0 none, 1 steele, 2 dektora, 3 lucy
kVariableGunPulledInFrontOfSebastian = 46,
@@ -1108,7 +1111,7 @@ enum Scenes {
kSceneHC03 = 33, // Hawker's Circle - Green pawn - Inside
kSceneHF01 = 34, // Hysteria Hall - Outside
kSceneHF02 = 35, // Hysteria Hall - Hall of Mirrors - Exit
- kSceneHF03 = 36, // Hysteria Hall - Arcade
+ kSceneHF03 = 36, // Hysteria Hall - Hysteria Arcade
kSceneHF04 = 37, // Hysteria Hall - Hall of Mirrors
kSceneHF05 = 38,
kSceneHF06 = 39,
@@ -1497,6 +1500,7 @@ enum GoalMcCoy {
};
enum GoalSteele {
+ // chapter 1
kGoalSteeleDefault = 0,
kGoalSteeleGoToRC01 = 1,
kGoalSteeleGoToRC02 = 2,
@@ -1509,6 +1513,7 @@ enum GoalSteele {
kGoalSteeleGoToPS02 = 9,
kGoalSteeleGoToFreeSlotG3 = 10,
kGoalSteeleInterviewGrigorian = 11,
+ // chapter 2
kGoalSteeleApprehendIzo = 100,
kGoalSteeleGoToTB02 = 110,
kGoalSteeleLeaveTB02 = 111,
@@ -1518,7 +1523,20 @@ enum GoalSteele {
kGoalSteeleArrestIzo = 121,
kGoalSteeleIzoBlockedByMcCoy = 125,
kGoalSteeleLeaveRC03 = 130,
- kGoalSteeleWalkAroundRestart = 190
+ kGoalSteeleWalkAroundRestart = 190,
+ // chapter 3
+ kGoalSteeleHF03ApproachLucy = 233,
+ kGoalSteeleHF03McCoyChasingLucy = 234,
+ kGoalSteeleHF02ConfrontLucy = 240,
+ kGoalSteeleHF02ShootLucy = 241,
+ kGoalSteeleHF02LucyShotBySteele = 242,
+ kGoalSteeleHF02LucyRanAway = 243,
+ kGoalSteeleHF02LucyShotByMcCoy = 244,
+ kGoalSteeleHF02LucyLostByMcCoy = 245,
+ kGoalSteeleGoToMcCoysSpinner = 246,
+ kGoalSteeleTalkAboutMissingSpinner = 280,
+ kGoalSteeleNR01StartChapter4 = 290,
+ kGoalSteeleHF01StartChapter4 = 291
};
enum GoalDektora {
diff --git a/engines/bladerunner/script/ai/holloway.cpp b/engines/bladerunner/script/ai/holloway.cpp
index 916706417c..e9f162e906 100644
--- a/engines/bladerunner/script/ai/holloway.cpp
+++ b/engines/bladerunner/script/ai/holloway.cpp
@@ -174,7 +174,7 @@ bool AIScriptHolloway::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Actor_Change_Animation_Mode(kActorDektora, kAnimationModeIdle);
}
Player_Gains_Control();
- Game_Flag_Set(616);
+ Game_Flag_Set(kFlagMcCoyCapturedByBaker);
Scene_Exits_Enable();
Actor_Set_Goal_Number(kActorSteele, 230);
Actor_Put_In_Set(kActorHolloway, kSetFreeSlotI);
diff --git a/engines/bladerunner/script/ai/lucy.cpp b/engines/bladerunner/script/ai/lucy.cpp
index 087e432237..8b16f11136 100644
--- a/engines/bladerunner/script/ai/lucy.cpp
+++ b/engines/bladerunner/script/ai/lucy.cpp
@@ -70,7 +70,7 @@ bool AIScriptLucy::Update() {
}
}
- if (Game_Flag_Query(616)
+ if (Game_Flag_Query(kFlagMcCoyCapturedByBaker)
&& Actor_Query_Goal_Number(kActorLucy) == kGoalLucyWillReturnToHF03
) {
Actor_Put_In_Set(kActorLucy, kSetHF03);
@@ -126,7 +126,7 @@ void AIScriptLucy::TimerExpired(int timer) {
void AIScriptLucy::CompletedMovementTrack() {
switch (Actor_Query_Goal_Number(kActorLucy)) {
case kGoalLucyGoToHF03:
- if (Game_Flag_Query(616)
+ if (Game_Flag_Query(kFlagMcCoyCapturedByBaker)
&& Global_Variable_Query(kVariableBehavior) == 3
) {
Actor_Set_Goal_Number(kActorLucy, kGoalLucyReturnToHF03);
@@ -193,7 +193,7 @@ void AIScriptLucy::CompletedMovementTrack() {
Actor_Set_Health(kActorLucy, 30, 30);
if (Global_Variable_Query(kVariableBehavior) == 3) {
- Actor_Set_Goal_Number(kActorSteele, 240);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF02ConfrontLucy);
}
break;
@@ -427,7 +427,7 @@ bool AIScriptLucy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Actor_Set_Goal_Number(kActorLucy, kGoalLucyHF04WalkAway);
if (Global_Variable_Query(kVariableBehavior) == 3) {
- Actor_Set_Goal_Number(kActorSteele, 243);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF02LucyRanAway);
Game_Flag_Set(kFlagLucyRanAway);
}
@@ -471,7 +471,7 @@ bool AIScriptLucy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
case 240: // not used anywhere
if (Global_Variable_Query(kVariableBehavior) == 3) {
Actor_Set_Goal_Number(kActorLucy, kGoalLucyDead);
- Actor_Set_Goal_Number(kActorSteele, 240);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF02ConfrontLucy);
} else {
Actor_Set_Goal_Number(kActorLucy, kGoalLucyGoneChapter3);
Game_Flag_Set(kFlagLucyRanAway);
diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp
index ff50d04e06..c03927dddd 100644
--- a/engines/bladerunner/script/ai/steele.cpp
+++ b/engines/bladerunner/script/ai/steele.cpp
@@ -306,8 +306,8 @@ void AIScriptSteele::CompletedMovementTrack() {
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleWalkAroundRestart);
break;
- case 241:
- Actor_Set_Goal_Number(kActorSteele, 242);
+ case kGoalSteeleHF02ShootLucy:
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF02LucyShotBySteele);
break;
case 423:
@@ -368,8 +368,8 @@ void AIScriptSteele::ClickedByPlayer() {
}
if (goal - 241 <= 9) {
- if (goal == 241) {
- Actor_Set_Goal_Number(kActorSteele, 242);
+ if (goal == kGoalSteeleHF02ShootLucy) {
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF02LucyShotBySteele);
return; //true;
}
@@ -560,6 +560,8 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
return false;
switch (newGoalNumber) {
+ // Chapter 1
+
case kGoalSteeleGoToRC01:
AI_Movement_Track_Flush(kActorSteele);
AI_Movement_Track_Append(kActorSteele, 12, 5);
@@ -633,7 +635,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
AI_Movement_Track_Repeat(kActorSteele);
return true;
- case 11:
+ case kGoalSteeleInterviewGrigorian:
Actor_Clue_Acquire(kActorSteele, kClueGrigorianInterviewA, true, kActorGrigorian);
if (Game_Flag_Query(kFlagIzoIsReplicant)) {
Actor_Clue_Acquire(kActorSteele, kClueGrigorianInterviewB1, true, kActorGrigorian);
@@ -643,6 +645,8 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleDefault);
return true;
+ // Chapter 2
+
case kGoalSteeleApprehendIzo:
AI_Movement_Track_Flush(kActorSteele);
if (Game_Flag_Query(kFlagIzoIsReplicant)) {
@@ -825,17 +829,23 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
AI_Movement_Track_Repeat(kActorSteele);
return true;
+ // Chapter 3
+
case 200:
AI_Movement_Track_Flush(kActorSteele);
return true;
case 205:
- if (Query_Score(kActorMcCoy) > Query_Score(kActorSteele) && Query_Score(kActorMcCoy) < 75) {
+ if (Query_Score(kActorMcCoy) > Query_Score(kActorSteele)
+ && Query_Score(kActorMcCoy) < 75
+ ) {
Set_Score(kActorSteele, Random_Query(2, 5) + Query_Score(kActorMcCoy));
}
+
if (Game_Flag_Query(kFlagRC04Locked)) {
Game_Flag_Set(643);
}
+
AI_Movement_Track_Flush(kActorSteele);
Actor_Put_In_Set(kActorSteele, kSetFreeSlotC);
Actor_Set_At_Waypoint(kActorSteele, 35, 0);
@@ -935,7 +945,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Set_Enter(kSetNR02, kSceneNR02);
return true;
- case 233:
+ case kGoalSteeleHF03ApproachLucy:
Game_Flag_Set(kFlagHF01toHF03);
Game_Flag_Reset(kFlagMcCoyInNightclubRow);
Game_Flag_Set(kFlagMcCoyInHysteriaHall);
@@ -944,7 +954,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Set_Enter(kSetHF03, kSceneHF03);
return true;
- case 234:
+ case kGoalSteeleHF03McCoyChasingLucy:
AI_Movement_Track_Flush(kActorSteele);
AI_Movement_Track_Append_Run(kActorSteele, 372, 0);
AI_Movement_Track_Append(kActorSteele, 35, 0);
@@ -963,7 +973,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Actor_Set_At_XYZ(kActorSteele, -118.13f, 2.84f, -197.90f, 305);
return true;
- case 240:
+ case kGoalSteeleHF02ConfrontLucy:
AI_Movement_Track_Flush(kActorSteele);
AI_Movement_Track_Flush(kActorLucy);
Actor_Put_In_Set(kActorSteele, kSetHF02);
@@ -972,21 +982,21 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Actor_Set_At_XYZ(kActorLucy, 596.49f, 47.76f, -260.04f, 731);
return true;
- case 241:
+ case kGoalSteeleHF02ShootLucy:
Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatAttack);
Delay(500);
Actor_Change_Animation_Mode(kActorLucy, kAnimationModeDie);
Actor_Set_Targetable(kActorLucy, false);
- Actor_Retired_Here(kActorLucy, 36, 18, 1, -1);
+ Actor_Retired_Here(kActorLucy, 36, 18, true, -1);
Delay(1000);
AI_Movement_Track_Flush(kActorSteele);
AI_Movement_Track_Append_Run(kActorSteele, 380, 0);
AI_Movement_Track_Repeat(kActorSteele);
Delay(500);
- ADQ_Add(kActorLucy, 340, 48);
+ ADQ_Add(kActorLucy, 340, kAnimationModeDie);
return true;
- case 242:
+ case kGoalSteeleHF02LucyShotBySteele:
AI_Movement_Track_Flush(kActorSteele);
Player_Loses_Control();
Delay(500);
@@ -1007,8 +1017,9 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
Actor_Says(kActorSteele, 80, 16);
Actor_Says(kActorMcCoy, 1560, 13);
+
Delay(500);
- Game_Flag_Set(617);
+ Game_Flag_Set(kFlagSpinnerMissing);
Player_Gains_Control();
if (Game_Flag_Query(kFlagSpinnerAtNR01)) {
Actor_Put_In_Set(kActorSteele, kSetNR01);
@@ -1025,27 +1036,27 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
}
return true;
- case 243:
+ case kGoalSteeleHF02LucyRanAway:
Player_Loses_Control();
Delay(500);
Actor_Put_In_Set(kActorSteele, kSetHF02);
Actor_Set_At_XYZ(kActorSteele, 254.94f, 47.76f, -262.58f, 210);
return true;
- case 244:
- Actor_Face_Actor(kActorMcCoy, kActorSteele, 1);
+ case kGoalSteeleHF02LucyShotByMcCoy:
+ Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
Actor_Says(kActorMcCoy, 1560, 14);
- Actor_Face_Actor(kActorSteele, kActorMcCoy, 1);
+ Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
Actor_Says(kActorSteele, 100, 13);
Actor_Says(kActorMcCoy, 1575, 13);
Actor_Says(kActorSteele, 120, 15);
- Actor_Set_Goal_Number(kActorSteele, 246);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleGoToMcCoysSpinner);
return true;
- case 245:
- Actor_Face_Actor(kActorSteele, kActorMcCoy, 1);
+ case kGoalSteeleHF02LucyLostByMcCoy:
+ Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
Actor_Says(kActorSteele, 150, 13);
- Actor_Face_Actor(kActorMcCoy, kActorSteele, 1);
+ Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
Actor_Says(kActorMcCoy, 1580, 13);
Actor_Says(kActorSteele, 160, 14);
Actor_Says(kActorMcCoy, 1585, 16);
@@ -1053,26 +1064,27 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Actor_Says(kActorSteele, 180, 17);
Actor_Says(kActorMcCoy, 1590, 17);
Actor_Says(kActorSteele, 200, 15);
- Actor_Set_Goal_Number(kActorSteele, 246);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleGoToMcCoysSpinner);
return true;
- case 246:
+ case kGoalSteeleGoToMcCoysSpinner:
Actor_Says(kActorSteele, 130, 13);
Actor_Says(kActorSteele, 140, 13);
+
Delay(500);
- Game_Flag_Set(617);
+ Game_Flag_Set(kFlagSpinnerMissing);
Player_Gains_Control();
- if (Game_Flag_Query(255)) {
+ if (Game_Flag_Query(kFlagSpinnerAtNR01)) {
Actor_Put_In_Set(kActorSteele, kSetNR01);
Actor_Set_At_XYZ(kActorSteele, 12.17f, 23.88f, -533.37f, 674);
- Game_Flag_Reset(255);
- Game_Flag_Reset(256);
+ Game_Flag_Reset(kFlagSpinnerAtNR01);
+ Game_Flag_Reset(kFlagSpinnerAtHF01);
Set_Enter(kSetNR01, kSceneNR01);
} else {
Actor_Put_In_Set(kActorSteele, kSetHF01);
Actor_Set_At_XYZ(kActorSteele, 324.32f, 8.0f, -465.87f, 674);
- Game_Flag_Reset(255);
- Game_Flag_Reset(256);
+ Game_Flag_Reset(kFlagSpinnerAtNR01);
+ Game_Flag_Reset(kFlagSpinnerAtHF01);
Set_Enter(kSetHF01, kSceneHF01);
}
return true;
@@ -1081,107 +1093,107 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
AI_Movement_Track_Flush(kActorSteele);
Actor_Put_In_Set(kActorSteele, kSetNR01);
Actor_Set_At_XYZ(kActorSteele, 94.03f, 23.88f, -794.46f, 685);
- if (Game_Flag_Query(255)) {
- Game_Flag_Reset(255);
- Game_Flag_Reset(256);
+ if (Game_Flag_Query(kFlagSpinnerAtNR01)) {
+ Game_Flag_Reset(kFlagSpinnerAtNR01);
+ Game_Flag_Reset(kFlagSpinnerAtHF01);
}
Game_Flag_Set(603);
- Actor_Change_Animation_Mode(kActorSteele, 0);
+ Actor_Change_Animation_Mode(kActorSteele, kAnimationModeIdle);
_var1 = 3;
return true;
case 251:
- Actor_Set_Targetable(kActorSteele, 1);
+ Actor_Set_Targetable(kActorSteele, true);
return true;
case 252:
Player_Loses_Control();
- Actor_Change_Animation_Mode(kActorSteele, 6);
+ Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatAttack);
Sound_Play(27, 100, 0, 0, 50);
Game_Flag_Reset(603);
- Actor_Set_Targetable(kActorSteele, 0);
+ Actor_Set_Targetable(kActorSteele, false);
Actor_Set_Goal_Number(kActorGordo, 299);
Delay(1500);
- Player_Set_Combat_Mode(0);
+ Player_Set_Combat_Mode(false);
Actor_Says(kActorSteele, 1070, 14);
- Actor_Face_Actor(kActorSteele, kActorMcCoy, 1);
+ Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
Actor_Says(kActorSteele, 1260, 16);
Actor_Says(kActorSteele, 1270, 13);
- Actor_Face_Actor(kActorMcCoy, kActorSteele, 1);
+ Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
Actor_Says(kActorMcCoy, 3065, 18);
Actor_Says(kActorSteele, 1280, 13);
Actor_Says(kActorSteele, 1290, 13);
Game_Flag_Set(592);
Player_Gains_Control();
- if (Game_Flag_Query(256)) {
+ if (Game_Flag_Query(kFlagSpinnerAtHF01)) {
Actor_Put_In_Set(kActorSteele, kSetHF01);
Actor_Set_At_XYZ(kActorSteele, 324.32f, 8.0f, -465.87f, 674);
- Game_Flag_Set(617);
- Game_Flag_Reset(255);
- Game_Flag_Reset(256);
+ Game_Flag_Set(kFlagSpinnerMissing);
+ Game_Flag_Reset(kFlagSpinnerAtNR01);
+ Game_Flag_Reset(kFlagSpinnerAtHF01);
Set_Enter(kSetHF01, kSceneHF01);
} else {
- Actor_Set_Goal_Number(kActorSteele, 280);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleTalkAboutMissingSpinner);
}
return true;
case 255:
ADQ_Flush();
- Actor_Change_Animation_Mode(kActorSteele, 6);
+ Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatAttack);
Sound_Play(27, 100, 0, 0, 50);
Actor_Force_Stop_Walking(kActorMcCoy);
- Actor_Change_Animation_Mode(kActorMcCoy, 48);
+ Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDie);
Actor_Retired_Here(kActorMcCoy, 12, 12, 1, -1);
Actor_Set_Goal_Number(kActorGordo, 251);
- Actor_Says(kActorSteele, 1250, 3);
+ Actor_Says(kActorSteele, 1250, kAnimationModeTalk);
return true;
case 258:
Game_Flag_Reset(603);
ADQ_Flush();
Game_Flag_Set(592);
- Actor_Set_Targetable(kActorSteele, 0);
+ Actor_Set_Targetable(kActorSteele, false);
Delay(1000);
- Player_Set_Combat_Mode(0);
+ Player_Set_Combat_Mode(false);
Player_Loses_Control();
_animationState = 40;
_animationFrame = 0;
Delay(2000);
- Actor_Change_Animation_Mode(kActorSteele, 0);
- Actor_Change_Animation_Mode(kActorMcCoy, 0);
- Actor_Face_Actor(kActorSteele, kActorMcCoy, 1);
+ Actor_Change_Animation_Mode(kActorSteele, kAnimationModeIdle);
+ Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeIdle);
+ Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
Actor_Says(kActorSteele, 1080, 17);
- Actor_Face_Actor(kActorMcCoy, kActorSteele, 1);
+ Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
Actor_Says(kActorMcCoy, 3025, 14);
Actor_Says(kActorSteele, 1090, 16);
- Actor_Face_Actor(kActorSteele, kActorGordo, 1);
+ Actor_Face_Actor(kActorSteele, kActorGordo, true);
Actor_Says(kActorSteele, 1100, 13);
Actor_Says(kActorSteele, 1110, 17);
Actor_Says(kActorMcCoy, 3030, 19);
- Actor_Face_Actor(kActorSteele, kActorMcCoy, 1);
+ Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
Actor_Says(kActorSteele, 1130, 15);
Actor_Says(kActorSteele, 1140, 12);
Player_Gains_Control();
- Actor_Set_Goal_Number(kActorSteele, 280);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleTalkAboutMissingSpinner);
return true;
case 260:
ADQ_Flush();
- Actor_Change_Animation_Mode(kActorMcCoy, 6);
+ Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeCombatAttack);
Sound_Play(27, 100, 0, 0, 50);
_animationState = 38;
_animationFrame = 0;
Actor_Set_Goal_Number(kActorGordo, 251);
Game_Flag_Reset(603);
Game_Flag_Set(592);
- Actor_Set_Targetable(kActorSteele, 0);
+ Actor_Set_Targetable(kActorSteele, false);
Player_Loses_Control();
return true;
case 262:
- Actor_Face_Actor(kActorSteele, kActorMcCoy, 1);
+ Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
Actor_Says(kActorSteele, 1160, 15);
- Actor_Face_Actor(kActorMcCoy, kActorSteele, 1);
+ Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
Actor_Says(kActorMcCoy, 3035, 14);
Actor_Says(kActorSteele, 1170, 16);
Actor_Says(kActorMcCoy, 3040, 15);
@@ -1194,10 +1206,10 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Actor_Says(kActorSteele, 1210, 14);
Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, -5);
Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 2);
- Player_Set_Combat_Mode(0);
+ Player_Set_Combat_Mode(false);
Music_Stop(2);
Player_Gains_Control();
- Actor_Set_Goal_Number(kActorSteele, 280);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleTalkAboutMissingSpinner);
return true;
case 270:
@@ -1214,32 +1226,32 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
case 275:
Delay(500);
- Game_Flag_Set(617);
+ Game_Flag_Set(kFlagSpinnerMissing);
Player_Gains_Control();
- if (Game_Flag_Query(255)) {
+ if (Game_Flag_Query(kFlagSpinnerAtNR01)) {
Actor_Put_In_Set(kActorSteele, kSetNR01);
Actor_Set_At_XYZ(kActorSteele, 12.17f, 23.88f, -533.37f, 674);
- Game_Flag_Reset(255);
- Game_Flag_Reset(256);
+ Game_Flag_Reset(kFlagSpinnerAtNR01);
+ Game_Flag_Reset(kFlagSpinnerAtHF01);
Set_Enter(kSetNR01, kSceneNR01);
} else {
Actor_Put_In_Set(kActorSteele, kSetHF01);
Actor_Set_At_XYZ(kActorSteele, 324.32f, 8.0f, -465.87f, 674);
- Game_Flag_Reset(255);
- Game_Flag_Reset(256);
+ Game_Flag_Reset(kFlagSpinnerAtNR01);
+ Game_Flag_Reset(kFlagSpinnerAtHF01);
Set_Enter(kSetHF01, kSceneHF01);
}
return true;
- case 280:
+ case kGoalSteeleTalkAboutMissingSpinner:
Actor_Says(kActorMcCoy, 2970, 15);
- Actor_Face_Actor(kActorSteele, kActorMcCoy, 1);
+ Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
Actor_Says(kActorSteele, 840, 16);
Actor_Says(kActorMcCoy, 2975, 15);
Actor_Says(kActorSteele, 850, 16);
- Actor_Says(kActorDispatcher, 0, 3);
- Actor_Says(kActorDispatcher, 10, 3);
- Actor_Face_Actor(kActorMcCoy, kActorSteele, 1);
+ Actor_Says(kActorDispatcher, 0, kAnimationModeTalk);
+ Actor_Says(kActorDispatcher, 10, kAnimationModeTalk);
+ Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
Actor_Says(kActorMcCoy, 2980, 12);
Actor_Says(kActorSteele, 860, 14);
Actor_Says(kActorMcCoy, 2985, 13);
@@ -1251,7 +1263,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Actor_Says(kActorSteele, 900, 13);
Actor_Says(kActorMcCoy, 3000, 13);
Actor_Says(kActorSteele, 920, 12);
- Actor_Says(kActorDispatcher, 30, 3);
+ Actor_Says(kActorDispatcher, 30, kAnimationModeTalk);
Actor_Says(kActorMcCoy, 3005, 14);
Actor_Says(kActorSteele, 930, 16);
Actor_Says(kActorSteele, 950, 13);
@@ -1260,36 +1272,36 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
Actor_Says(kActorSteele, 970, 13);
Actor_Says(kActorMcCoy, 3015, 12);
Actor_Says(kActorSteele, 980, 17);
- if (Player_Query_Current_Scene() == 54) {
- Actor_Set_Goal_Number(kActorSteele, 290);
+ if (Player_Query_Current_Scene() == kSceneNR01) {
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR01StartChapter4);
} else {
- Actor_Set_Goal_Number(kActorSteele, 291);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF01StartChapter4);
}
return true;
case 285:
- Actor_Set_Goal_Number(kActorSteele, 290);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR01StartChapter4);
return true;
- case 290:
+ case kGoalSteeleNR01StartChapter4:
Loop_Actor_Walk_To_XYZ(kActorMcCoy, -281.0f, 31.93f, -1061.0f, 0, false, true, 0);
Actor_Face_Heading(kActorMcCoy, 45, false);
Loop_Actor_Travel_Stairs(kActorMcCoy, 3, false, kAnimationModeIdle);
- Global_Variable_Set(1, 4);
+ Global_Variable_Set(kVariableChapter, 4);
Scene_Exits_Enable();
Actor_Set_Health(kActorMcCoy, 50, 50);
Game_Flag_Set(523);
Game_Flag_Set(kFlagNR01toUG06);
- Game_Flag_Set(680);
+ Game_Flag_Set(kFlagChapter4Intro);
Chapter_Enter(4, kSetUG06, kSceneUG06);
return true;
- case 291:
+ case kGoalSteeleHF01StartChapter4:
Game_Flag_Set(722);
Global_Variable_Set(kVariableChapter, 4);
Scene_Exits_Enable();
Game_Flag_Set(523);
- Game_Flag_Set(680);
+ Game_Flag_Set(kFlagChapter4Intro);
Chapter_Enter(4, kSetUG06, kSceneUG06);
return true;
diff --git a/engines/bladerunner/script/scene/hf01.cpp b/engines/bladerunner/script/scene/hf01.cpp
index 9e0c0fa497..200d82b618 100644
--- a/engines/bladerunner/script/scene/hf01.cpp
+++ b/engines/bladerunner/script/scene/hf01.cpp
@@ -33,7 +33,7 @@ enum kHF01Loops {
};
void SceneScriptHF01::InitializeScene() {
- if (Game_Flag_Query(617)) {
+ if (Game_Flag_Query(kFlagSpinnerMissing)) {
Setup_Scene_Information(243.94f, 8.0f, -341.9f, 342);
} else if (Game_Flag_Query(kFlagHF05toHF01)) {
Setup_Scene_Information(-202.0f, 0.0f, -619.0f, 407);
@@ -359,9 +359,9 @@ void SceneScriptHF01::PlayerWalkedIn() {
}
}
- if (Game_Flag_Query(617)) {
+ if (Game_Flag_Query(kFlagSpinnerMissing)) {
Actor_Set_Goal_Number(kActorSteele, 280);
- Game_Flag_Reset(617);
+ Game_Flag_Reset(kFlagSpinnerMissing);
//return true;
return;
}
diff --git a/engines/bladerunner/script/scene/hf02.cpp b/engines/bladerunner/script/scene/hf02.cpp
index 117851794b..c3d3b5a0a2 100644
--- a/engines/bladerunner/script/scene/hf02.cpp
+++ b/engines/bladerunner/script/scene/hf02.cpp
@@ -58,11 +58,11 @@ void SceneScriptHF02::InitializeScene() {
void SceneScriptHF02::SceneLoaded() {
Obstacle_Object("BARD_NEON", true);
Unclickable_Object("BARD_NEON");
- if (Actor_Query_Goal_Number(kActorSteele) == 234) {
+ if (Actor_Query_Goal_Number(kActorSteele) == kGoalSteeleHF03McCoyChasingLucy) {
if (Game_Flag_Query(kFlagLucyRanAway)) {
- Actor_Set_Goal_Number(kActorSteele, 243);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF02LucyRanAway);
} else {
- Actor_Set_Goal_Number(kActorSteele, 240);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF02ConfrontLucy);
}
}
}
@@ -119,8 +119,8 @@ void SceneScriptHF02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
}
void SceneScriptHF02::PlayerWalkedIn() {
- if (Actor_Query_Goal_Number(kActorSteele) == 240) {
- Actor_Set_Goal_Number(kActorSteele, 241);
+ if (Actor_Query_Goal_Number(kActorSteele) == kGoalSteeleHF02ConfrontLucy) {
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF02ShootLucy);
}
if (Game_Flag_Query(kFlagHF03toHF02)) {
@@ -131,11 +131,11 @@ void SceneScriptHF02::PlayerWalkedIn() {
Game_Flag_Reset(kFlagHF01toHF02);
}
- if (Actor_Query_Goal_Number(kActorSteele) == 243) {
+ if (Actor_Query_Goal_Number(kActorSteele) == kGoalSteeleHF02LucyRanAway) {
if (Actor_Query_Goal_Number(kActorLucy) == kGoalLucyDead) {
- Actor_Set_Goal_Number(kActorSteele, 244);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF02LucyShotByMcCoy);
} else {
- Actor_Set_Goal_Number(kActorSteele, 245);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF02LucyLostByMcCoy);
}
}
}
diff --git a/engines/bladerunner/script/scene/hf03.cpp b/engines/bladerunner/script/scene/hf03.cpp
index f54f8baa8c..849f75feec 100644
--- a/engines/bladerunner/script/scene/hf03.cpp
+++ b/engines/bladerunner/script/scene/hf03.cpp
@@ -259,7 +259,7 @@ void SceneScriptHF03::PlayerWalkedIn() {
Actor_Says(kActorSteele, 230, 16);
Actor_Says(kActorMcCoy, 1690, 12);
Actor_Says(kActorSteele, 240, 13);
- Actor_Set_Goal_Number(kActorSteele, 234);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF03McCoyChasingLucy);
}
}
diff --git a/engines/bladerunner/script/scene/nr01.cpp b/engines/bladerunner/script/scene/nr01.cpp
index 5bc76d948d..496d277577 100644
--- a/engines/bladerunner/script/scene/nr01.cpp
+++ b/engines/bladerunner/script/scene/nr01.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
void SceneScriptNR01::InitializeScene() {
- if (Game_Flag_Query(617)) {
+ if (Game_Flag_Query(kFlagSpinnerMissing)) {
Setup_Scene_Information(-153.86f, 23.88f, -570.21f, 402);
} else if (Game_Flag_Query(632)) {
Setup_Scene_Information( -416.0f, 31.93f, -841.0f, 200);
@@ -276,9 +276,9 @@ void SceneScriptNR01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
}
void SceneScriptNR01::PlayerWalkedIn() {
- if (Game_Flag_Query(617)) {
+ if (Game_Flag_Query(kFlagSpinnerMissing)) {
Actor_Set_Goal_Number(kActorSteele, 280);
- Game_Flag_Reset(617);
+ Game_Flag_Reset(kFlagSpinnerMissing);
//return true;
return;
}
@@ -386,7 +386,7 @@ void SceneScriptNR01::PlayerWalkedIn() {
Actor_Says(kActorSteele, 1570, 12);
Actor_Says(kActorSteele, 1580, 14);
Actor_Says(kActorMcCoy, 3190, 12);
- Actor_Set_Goal_Number(kActorSteele, 233);
+ Actor_Set_Goal_Number(kActorSteele, kGoalSteeleHF03ApproachLucy);
}
}
}
diff --git a/engines/bladerunner/script/scene/ug06.cpp b/engines/bladerunner/script/scene/ug06.cpp
index a979c9dd0f..174ba75972 100644
--- a/engines/bladerunner/script/scene/ug06.cpp
+++ b/engines/bladerunner/script/scene/ug06.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
void SceneScriptUG06::InitializeScene() {
- if (Game_Flag_Query(680)) {
+ if (Game_Flag_Query(kFlagChapter4Intro)) {
Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
Ambient_Sounds_Remove_All_Looping_Sounds(1);
Outtake_Play(kOuttakeMovieC1, false, -1);
@@ -34,7 +34,7 @@ void SceneScriptUG06::InitializeScene() {
} else {
Outtake_Play(kOuttakeMovieC2, false, -1);
}
- Game_Flag_Reset(680);
+ Game_Flag_Reset(kFlagChapter4Intro);
}
if (Game_Flag_Query(kFlagUG04toUG06)) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 03:48:59 +0000