BLADERUNNER: More game constants

1 files changed, 33 insertions, 24 deletions

diff --git a/engines/bladerunner/script/scene/rc51.cpp b/engines/bladerunner/script/scene/rc51.cpp
index 6a376a725b..8019ea0462 100644
--- a/engines/bladerunner/script/scene/rc51.cpp
+++ b/engines/bladerunner/script/scene/rc51.cpp
@@ -24,11 +24,20 @@
 
 namespace BladeRunner {
 
+enum kRC51Loops {
+	kRC51LoopInshotFromRC02 = 0,
+	kRC51LoopMain           = 1
+};
+
+enum kRC51Exits {
+	kRC51ExitRC02 = 0
+};
+
 void SceneScriptRC51::InitializeScene() {
 	Setup_Scene_Information(-8.87f, -1238.89f, 108164.27f, 66);
-	Scene_Exit_Add_2D_Exit(0, 0, 460, 639, 479, 2);
-	Scene_Loop_Start_Special(0, 0, 0);
-	Scene_Loop_Set_Default(1);
+	Scene_Exit_Add_2D_Exit(kRC51ExitRC02, 0, 460, 639, 479, 2);
+	Scene_Loop_Start_Special(kSceneLoopModeLoseControl, kRC51LoopInshotFromRC02, false);
+	Scene_Loop_Set_Default(kRC51LoopMain);
 }
 
 void SceneScriptRC51::SceneLoaded() {
@@ -38,14 +47,14 @@ void SceneScriptRC51::SceneLoaded() {
 	Unclickable_Object("GRL_DSK");
 	Unclickable_Object("GRL_DSKLEG");
 	Unclickable_Object("CURTAIN");
-	if (!Game_Flag_Query(147)) {
-		Item_Add_To_World(82, 937, 16, 47.56f, -1238.89f, 108048.61f, 0, 6, 18, false, true, false, true);
+	if (!Game_Flag_Query(kFlagChopstickWrapperTaken)) {
+		Item_Add_To_World(kItemChopstickWrapper, 937, kSetRC02_RC51, 47.56f, -1238.89f, 108048.61f, 0, 6, 18, false, true, false, true);
 	}
-	if (!Game_Flag_Query(148)) {
-		Item_Add_To_World(79, 933, 16, 67.28f, -1193.38f, 108011.27f, 0, 6, 6, false, true, false, true);
+	if (!Game_Flag_Query(kFlagCandyTaken)) {
+		Item_Add_To_World(kItemCandy, 933, kSetRC02_RC51, 67.28f, -1193.38f, 108011.27f, 0, 6, 6, false, true, false, true);
 	}
-	if (!Game_Flag_Query(149)) {
-		Item_Add_To_World(98, 971, 16, -69.65f, -1238.89f, 107995.24f, 256, 18, 18, false, true, false, true);
+	if (!Game_Flag_Query(kFlagDogTaken)) {
+		Item_Add_To_World(kItemToyDog, 971, kSetRC02_RC51, -69.65f, -1238.89f, 107995.24f, 256, 18, 18, false, true, false, true);
 	}
 }
 
@@ -67,41 +76,41 @@ bool SceneScriptRC51::ClickedOnActor(int actorId) {
 }
 
 bool SceneScriptRC51::ClickedOnItem(int itemId, bool a2) {
-	if (itemId == 82 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 17.97f, -1238.89f, 108053.5f, 0, 1, false, 0)) {
-		Actor_Face_Item(kActorMcCoy, 82, true);
+	if (itemId == kItemChopstickWrapper && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 17.97f, -1238.89f, 108053.5f, 0, false, false, 0)) {
+		Actor_Face_Item(kActorMcCoy, kItemChopstickWrapper, true);
 		Actor_Clue_Acquire(kActorMcCoy, kClueChopstickWrapper, 1, -1);
-		Item_Remove_From_World(82);
+		Item_Remove_From_World(kItemChopstickWrapper);
 		Item_Pickup_Spin_Effect(937, 437, 407);
 		Actor_Voice_Over(2010, kActorVoiceOver);
-		Game_Flag_Set(147);
+		Game_Flag_Set(kFlagChopstickWrapperTaken);
 		return true;
 	}
-	if (itemId == 79 && !Loop_Actor_Walk_To_Item(kActorMcCoy, 79, 36, 1, false)) {
-		Actor_Face_Item(kActorMcCoy, 79, true);
+	if (itemId == kItemCandy && !Loop_Actor_Walk_To_Item(kActorMcCoy, kItemCandy, 36, true, false)) {
+		Actor_Face_Item(kActorMcCoy, kItemCandy, true);
 		Actor_Clue_Acquire(kActorMcCoy, kClueCandy, 1, -1);
-		Item_Remove_From_World(79);
+		Item_Remove_From_World(kItemCandy);
 		Item_Pickup_Spin_Effect(933, 445, 230);
 		Actor_Says(kActorMcCoy, 8735, 3);
 		Actor_Says(kActorMcCoy, 8529, 3);
-		Game_Flag_Set(148);
+		Game_Flag_Set(kFlagCandyTaken);
 		return true;
 	}
-	if (itemId == 98 && !Loop_Actor_Walk_To_Item(kActorMcCoy, 98, 36, 1, false)) {
-		Actor_Face_Item(kActorMcCoy, 98, true);
+	if (itemId == kItemToyDog && !Loop_Actor_Walk_To_Item(kActorMcCoy, kItemToyDog, 36, true, false)) {
+		Actor_Face_Item(kActorMcCoy, kItemToyDog, true);
 		Actor_Clue_Acquire(kActorMcCoy, kClueToyDog, 1, -1);
-		Item_Remove_From_World(98);
+		Item_Remove_From_World(kItemToyDog);
 		Item_Pickup_Spin_Effect(971, 55, 376);
 		Actor_Says(kActorMcCoy, 8525, 3);
 		Actor_Says(kActorMcCoy, 8740, 3);
-		Game_Flag_Set(149);
+		Game_Flag_Set(kFlagDogTaken);
 		return true;
 	}
 	return false;
 }
 
 bool SceneScriptRC51::ClickedOnExit(int exitId) {
-	if (exitId == 0 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, -8.87f, -1238.89f, 108173.27f, 0, 1, false, 0)) {
-		Set_Enter(16, kSceneRC02);
+	if (exitId == kRC51ExitRC02 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, -8.87f, -1238.89f, 108173.27f, 0, true, false, 0)) {
+		Set_Enter(kSetRC02_RC51, kSceneRC02);
 		return true;
 	}
 	return false;
@@ -118,7 +127,7 @@ void SceneScriptRC51::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptRC51::PlayerWalkedIn() {
-	Game_Flag_Set(709);
+	Game_Flag_Set(kFlagRC51Discovered);
 }
 
 void SceneScriptRC51::PlayerWalkedOut() {