BLADERUNNER: More game constants

1 files changed, 20 insertions, 15 deletions

diff --git a/engines/bladerunner/script/scene/rc02.cpp b/engines/bladerunner/script/scene/rc02.cpp
index 0a95e40a5c..9305b797f4 100644
--- a/engines/bladerunner/script/scene/rc02.cpp
+++ b/engines/bladerunner/script/scene/rc02.cpp
@@ -24,15 +24,20 @@
 
 namespace BladeRunner {
 
+enum kRC02Exits {
+	kRC02ExitRC01 = 0,
+	kRC02ExitRC51 = 1
+};
+
 void SceneScriptRC02::InitializeScene() {
 	if (Game_Flag_Query(kFlagRC01toRC02)) {
 		Setup_Scene_Information(-103.0f, -1238.89f, 108603.04f, 1007);
 	} else {
 		Setup_Scene_Information(-20.2f, -1238.89f, 108100.73f, 539);
 	}
-	Scene_Exit_Add_2D_Exit(0, 0, 460, 639, 479, 2);
-	if (Game_Flag_Query(141)) {
-		Scene_Exit_Add_2D_Exit(1, 265, 58, 346, 154, 0);
+	Scene_Exit_Add_2D_Exit(kRC02ExitRC01, 0, 460, 639, 479, 2);
+	if (Game_Flag_Query(kFlagRC02LucyDeskAvailable)) {
+		Scene_Exit_Add_2D_Exit(kRC02ExitRC51, 265, 58, 346, 154, 0);
 	}
 	Ambient_Sounds_Remove_All_Non_Looping_Sounds(0);
 	Ambient_Sounds_Add_Looping_Sound(71, 50, 1, 1);
@@ -76,7 +81,7 @@ void SceneScriptRC02::SceneLoaded() {
 	Unclickable_Object("DRAPE05");
 	Unclickable_Object("DRAPE06");
 	Unclickable_Object("DRAPE07");
-	if (Actor_Clue_Query(kActorMcCoy, kClueRuncitersVideo) || Global_Variable_Query(1) > 1) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueRuncitersVideo) || Global_Variable_Query(kVariableChapter) > 1) {
 		Unclickable_Object("SCRTY CA03");
 	}
 	if (!Game_Flag_Query(kFlagShellCasingsTaken)) {
@@ -170,8 +175,8 @@ void SceneScriptRC02::dialogueWithRunciter() {
 		Actor_Face_Object(kActorRunciter, "CURTAIN", true);
 		Actor_Says(kActorRunciter, 350, 13);
 		Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
-		Scene_Exit_Add_2D_Exit(1, 265, 58, 346, 154, 0);
-		Game_Flag_Set(141);
+		Scene_Exit_Add_2D_Exit(kRC02ExitRC51, 265, 58, 346, 154, 0);
+		Game_Flag_Set(kFlagRC02LucyDeskAvailable);
 		break;
 	case 20:
 		Actor_Says(kActorMcCoy, 4590, 19);
@@ -202,7 +207,7 @@ bool SceneScriptRC02::ClickedOnActor(int actorId) {
 		return false;
 	}
 
-	if (Global_Variable_Query(1) == 4) {
+	if (Global_Variable_Query(kVariableChapter) == 4) {
 		Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
 		if (Actor_Query_Goal_Number(kActorRunciter) == 599) {
 			if (Random_Query(1, 2) == 1) {
@@ -312,22 +317,22 @@ bool SceneScriptRC02::ClickedOnItem(int itemId, bool a2) {
 }
 
 bool SceneScriptRC02::ClickedOnExit(int exitId) {
-	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -71.51f, -1238.89f, 108587.15f, 0, 1, false, 0)) {
+	if (exitId == kRC02ExitRC01) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -71.51f, -1238.89f, 108587.15f, 0, true, false, 0)) {
 			Game_Flag_Set(kFlagRC02toRC01);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_Looping_Sound(71, true);
 			Ambient_Sounds_Remove_Looping_Sound(75, true);
 			Ambient_Sounds_Adjust_Looping_Sound(85, 100, -101, 1);
 			Actor_Set_Goal_Number(kActorRunciter, 0);
-			Set_Enter(69, kSceneRC01);
+			Set_Enter(kSetRC01, kSceneRC01);
 		}
 		return true;
 	}
-	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -20.2f, -1238.73f, 108152.73f, 0, 1, false, 0)) {
+	if (exitId == kRC02ExitRC51) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -20.2f, -1238.73f, 108152.73f, 0, true, false, 0)) {
 			Async_Actor_Walk_To_XYZ(kActorMcCoy, -8.87f, -1238.89f, 108076.27f, 0, false);
-			Set_Enter(16, kSceneRC51);
+			Set_Enter(kSetRC02_RC51, kSceneRC51);
 		}
 		return true;
 	}
@@ -348,7 +353,7 @@ void SceneScriptRC02::PlayerWalkedIn() {
 	Player_Set_Combat_Mode(false);
 	if (Game_Flag_Query(kFlagRC01toRC02)) {
 		Player_Loses_Control();
-		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -72.2f, -1238.89f, 108496.73f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -72.2f, -1238.89f, 108496.73f, 0, false, false, 0);
 		Player_Gains_Control();
 		Game_Flag_Reset(kFlagRC01toRC02);
 		if (!Game_Flag_Query(kFlagRC02Discovered)) {
@@ -359,7 +364,7 @@ void SceneScriptRC02::PlayerWalkedIn() {
 			Actor_Clue_Acquire(kActorMcCoy, kClueGracefulFootprints, 1, -1);
 			Game_Flag_Set(kFlagRC02Discovered);
 		}
-		if (Actor_Query_Which_Set_In(kActorRunciter) == 16 && Actor_Query_Goal_Number(kActorRunciter) < 300) {
+		if (Actor_Query_Which_Set_In(kActorRunciter) == kSetRC02_RC51 && Actor_Query_Goal_Number(kActorRunciter) < 300) {
 			Actor_Set_Goal_Number(kActorRunciter, 1);
 		}
 		if (Actor_Query_Goal_Number(kActorRunciter) == 300 && !Game_Flag_Query(704)) {