BLADERUNNER: introduced some game constants

Game script are more readable now
Fixed name of Officer Leary

1 files changed, 116 insertions, 116 deletions

diff --git a/engines/bladerunner/script/scene/dr03.cpp b/engines/bladerunner/script/scene/dr03.cpp
index f0de30deb8..3fe1a91f64 100644
--- a/engines/bladerunner/script/scene/dr03.cpp
+++ b/engines/bladerunner/script/scene/dr03.cpp
@@ -32,11 +32,11 @@ void SceneScriptDR03::InitializeScene() {
 	Setup_Scene_Information(330.31f, 4.27f, -910.91f, 297);
 	Scene_Exit_Add_2D_Exit(0, 377, 122, 445, 266, 0);
 	if (Global_Variable_Query(1) == 3) {
-		Actor_Put_In_Set(52, 34);
-		Actor_Set_At_XYZ(52, 431.21f, 4.27f, -776.26f, 0);
+		Actor_Put_In_Set(kActorChew, 34);
+		Actor_Set_At_XYZ(kActorChew, 431.21f, 4.27f, -776.26f, 0);
 	} else {
-		Actor_Put_In_Set(52, 34);
-		Actor_Set_At_XYZ(52, 360.77f, 4.4f, -806.67f, 126);
+		Actor_Put_In_Set(kActorChew, 34);
+		Actor_Set_At_XYZ(kActorChew, 360.77f, 4.4f, -806.67f, 126);
 	}
 	Ambient_Sounds_Remove_All_Looping_Sounds(1);
 	Ambient_Sounds_Add_Looping_Sound(110, 7, 0, 1);
@@ -45,9 +45,9 @@ void SceneScriptDR03::InitializeScene() {
 }
 
 void SceneScriptDR03::SceneLoaded() {
-	Obstacle_Object("W2-CENTCASE02", 1);
-	Obstacle_Object("W2-CARTTOP", 1);
-	Obstacle_Object("W2-TANKAFLUID01", 1);
+	Obstacle_Object("W2-CENTCASE02", true);
+	Obstacle_Object("W2-CARTTOP", true);
+	Obstacle_Object("W2-TANKAFLUID01", true);
 }
 
 bool SceneScriptDR03::MouseClick(int x, int y) {
@@ -60,61 +60,61 @@ bool SceneScriptDR03::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptDR03::ClickedOnActor(int actorId) {
 	if (actorId == 52) {
-		Actor_Face_Actor(0, 52, 1);
-		Actor_Face_Actor(52, 0, 1);
+		Actor_Face_Actor(kActorMcCoy, kActorChew, true);
+		Actor_Face_Actor(kActorChew, kActorMcCoy, true);
 		if (!Game_Flag_Query(267)) {
-			Actor_Says(0, 755, 18);
-			Actor_Says(52, 10, 14);
-			Actor_Says(0, 760, 18);
-			Actor_Says(52, 20, 14);
-			Actor_Says(0, 765, 18);
-			Actor_Says(52, 30, 14);
+			Actor_Says(kActorMcCoy, 755, 18);
+			Actor_Says(kActorChew, 10, 14);
+			Actor_Says(kActorMcCoy, 760, 18);
+			Actor_Says(kActorChew, 20, 14);
+			Actor_Says(kActorMcCoy, 765, 18);
+			Actor_Says(kActorChew, 30, 14);
 			Game_Flag_Set(267);
 			return true;
 		}
-		if (Actor_Clue_Query(0, 67)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueChewInterview)) {
 			if (Game_Flag_Query(266) && Game_Flag_Query(267)) {
-				Actor_Says(0, 815, 18);
-				Actor_Says(52, 60, 14);
-				Actor_Says(52, 70, 14);
-				Actor_Says(52, 80, 14);
-				Actor_Says(0, 820, 18);
-				Actor_Says(52, 90, 14);
-				Actor_Says(0, 825, 18);
-				Actor_Says(52, 100, 14);
+				Actor_Says(kActorMcCoy, 815, 18);
+				Actor_Says(kActorChew, 60, 14);
+				Actor_Says(kActorChew, 70, 14);
+				Actor_Says(kActorChew, 80, 14);
+				Actor_Says(kActorMcCoy, 820, 18);
+				Actor_Says(kActorChew, 90, 14);
+				Actor_Says(kActorMcCoy, 825, 18);
+				Actor_Says(kActorChew, 100, 14);
 				Game_Flag_Reset(266);
 				Game_Flag_Set(505);
 				return true;
 			}
-			if ((Actor_Clue_Query(0, 147) || Actor_Clue_Query(0, 71) || Actor_Clue_Query(0, 76) || Actor_Clue_Query(0, 67))
+			if ((Actor_Clue_Query(kActorMcCoy, kClueDNATyrell) || Actor_Clue_Query(kActorMcCoy, kClueAnsweringMachineMessage) || Actor_Clue_Query(kActorMcCoy, kClueEnvelope) || Actor_Clue_Query(kActorMcCoy, kClueChewInterview))
 				&& Game_Flag_Query(505)) {
 				sub_401B18();
 			} else {
-				Actor_Says(0, 810, 18);
-				Actor_Says(52, 40, 14);
-				Actor_Says(52, 50, 14);
+				Actor_Says(kActorMcCoy, 810, 18);
+				Actor_Says(kActorChew, 40, 14);
+				Actor_Says(kActorChew, 50, 14);
 			}
 			return true;
 		}
-		Actor_Says(0, 770, 12);
-		Actor_Says(52, 110, 12);
-		Actor_Says(52, 120, 13);
-		Actor_Says(0, 835, 13);
-		Actor_Says(52, 130, 14);
-		Actor_Says(0, 840, 16);
-		Actor_Says(52, 140, 15);
+		Actor_Says(kActorMcCoy, 770, 12);
+		Actor_Says(kActorChew, 110, 12);
+		Actor_Says(kActorChew, 120, 13);
+		Actor_Says(kActorMcCoy, 835, 13);
+		Actor_Says(kActorChew, 130, 14);
+		Actor_Says(kActorMcCoy, 840, 16);
+		Actor_Says(kActorChew, 140, 15);
 		if (!Game_Flag_Query(505)) {
-			Actor_Says(52, 150, 13);
-			Actor_Says(0, 845, 17);
-			Actor_Says(52, 170, 18);
-			Actor_Says(52, 180, 16);
-			Actor_Says(0, 850, 15);
-			Actor_Says(52, 190, 14);
-			Actor_Says(52, 200, 13);
-			Actor_Says(0, 855, 18);
-			Actor_Says(52, 210, 12);
+			Actor_Says(kActorChew, 150, 13);
+			Actor_Says(kActorMcCoy, 845, 17);
+			Actor_Says(kActorChew, 170, 18);
+			Actor_Says(kActorChew, 180, 16);
+			Actor_Says(kActorMcCoy, 850, 15);
+			Actor_Says(kActorChew, 190, 14);
+			Actor_Says(kActorChew, 200, 13);
+			Actor_Says(kActorMcCoy, 855, 18);
+			Actor_Says(kActorChew, 210, 12);
 		}
-		Actor_Clue_Acquire(0, 67, 1, 52);
+		Actor_Clue_Acquire(kActorMcCoy, kClueChewInterview, 1, kActorChew);
 		return true;
 	}
 	return false;
@@ -126,7 +126,7 @@ bool SceneScriptDR03::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptDR03::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 330.31f, 4.27f, -910.91f, 24, 1, 0, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 330.31f, 4.27f, -910.91f, 24, 1, false, 0)) {
 			Game_Flag_Set(227);
 			Set_Enter(7, 26);
 		}
@@ -155,14 +155,14 @@ void SceneScriptDR03::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 void SceneScriptDR03::PlayerWalkedIn() {
 	if (!Game_Flag_Query(226)) {
 		if (Random_Query(1, 2) == 1) {
-			Actor_Says(52, 660, 14);
-			Actor_Says(52, 680, 14);
+			Actor_Says(kActorChew, 660, 14);
+			Actor_Says(kActorChew, 680, 14);
 		} else if (Random_Query(1, 2) == 2) {
-			Actor_Says(52, 670, 14);
-			Actor_Says(52, 620, 14);
+			Actor_Says(kActorChew, 670, 14);
+			Actor_Says(kActorChew, 620, 14);
 		} else {
-			Actor_Says(52, 690, 14);
-			Actor_Says(52, 710, 14);
+			Actor_Says(kActorChew, 690, 14);
+			Actor_Says(kActorChew, 710, 14);
 		}
 	}
 }
@@ -175,20 +175,20 @@ void SceneScriptDR03::DialogueQueueFlushed(int a1) {
 
 void SceneScriptDR03::sub_401B18() {
 	Dialogue_Menu_Clear_List();
-	if (Actor_Clue_Query(0, 67) || Actor_Clue_Query(0, 71) || Actor_Clue_Query(0, 68)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueChewInterview) || Actor_Clue_Query(kActorMcCoy, kClueAnsweringMachineMessage) || Actor_Clue_Query(kActorMcCoy, kClueMorajiInterview)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(650, 5, 5, 5);
 	}
-	if (Actor_Clue_Query(0, 67)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueChewInterview)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(660, 5, 5, 5);
 	}
-	if (Actor_Clue_Query(0, 279)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueTyrellInterview)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(670, 6, 5, 2);
 	}
 	if (Game_Flag_Query(505)) {
-		if (Actor_Clue_Query(0, 71)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueAnsweringMachineMessage)) {
 			DM_Add_To_List_Never_Repeat_Once_Selected(680, 8, 8, 8);
 		}
-		if (Actor_Clue_Query(0, 76)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueEnvelope)) {
 			DM_Add_To_List_Never_Repeat_Once_Selected(1270, 2, 5, 7);
 		}
 	}
@@ -198,89 +198,89 @@ void SceneScriptDR03::sub_401B18() {
 	Dialogue_Menu_Disappear();
 	switch (answer) {
 	case 640:
-		Actor_Says(0, 770, 12);
-		Actor_Says(52, 110, 12);
-		Actor_Says(52, 120, 13);
-		Actor_Says(0, 835, 13);
-		Actor_Says(52, 130, 14);
-		Actor_Says(0, 840, 16);
-		Actor_Says(52, 140, 15);
+		Actor_Says(kActorMcCoy, 770, 12);
+		Actor_Says(kActorChew, 110, 12);
+		Actor_Says(kActorChew, 120, 13);
+		Actor_Says(kActorMcCoy, 835, 13);
+		Actor_Says(kActorChew, 130, 14);
+		Actor_Says(kActorMcCoy, 840, 16);
+		Actor_Says(kActorChew, 140, 15);
 		if (!Game_Flag_Query(505)) {
-			Actor_Says(52, 150, 13);
-			Actor_Says(0, 845, 17);
-			Actor_Says(52, 170, 18);
-			Actor_Says(52, 180, 16);
-			Actor_Says(0, 850, 15);
-			Actor_Says(52, 190, 14);
-			Actor_Says(52, 200, 13);
-			Actor_Says(0, 855, 18);
-			Actor_Says(52, 210, 12);
+			Actor_Says(kActorChew, 150, 13);
+			Actor_Says(kActorMcCoy, 845, 17);
+			Actor_Says(kActorChew, 170, 18);
+			Actor_Says(kActorChew, 180, 16);
+			Actor_Says(kActorMcCoy, 850, 15);
+			Actor_Says(kActorChew, 190, 14);
+			Actor_Says(kActorChew, 200, 13);
+			Actor_Says(kActorMcCoy, 855, 18);
+			Actor_Says(kActorChew, 210, 12);
 		}
-		Actor_Clue_Acquire(0, 67, 1, 52);
+		Actor_Clue_Acquire(kActorMcCoy, kClueChewInterview, 1, kActorChew);
 		break;
 	case 650:
-		Actor_Says(0, 775, 11);
-		Actor_Says(52, 220, 14);
-		Actor_Says(0, 860, 11);
-		Actor_Says(52, 230, 14);
-		Actor_Says(0, 865, 11);
-		Actor_Says(52, 240, 14);
-		Actor_Says(52, 250, 14);
+		Actor_Says(kActorMcCoy, 775, 11);
+		Actor_Says(kActorChew, 220, 14);
+		Actor_Says(kActorMcCoy, 860, 11);
+		Actor_Says(kActorChew, 230, 14);
+		Actor_Says(kActorMcCoy, 865, 11);
+		Actor_Says(kActorChew, 240, 14);
+		Actor_Says(kActorChew, 250, 14);
 		break;
 	case 660:
-		Actor_Says(0, 780, 13);
+		Actor_Says(kActorMcCoy, 780, 13);
 		if (Game_Flag_Query(505)) {
-			Actor_Says(52, 260, 14);
-			Actor_Says(52, 270, 13);
-			Actor_Says(52, 280, 12);
+			Actor_Says(kActorChew, 260, 14);
+			Actor_Says(kActorChew, 270, 13);
+			Actor_Says(kActorChew, 280, 12);
 		} else {
-			Actor_Says(52, 260, 14);
-			Actor_Says(52, 270, 13);
-			Actor_Says(52, 280, 12);
-			Actor_Says(0, 870, 18);
-			Actor_Says(52, 290, 15);
+			Actor_Says(kActorChew, 260, 14);
+			Actor_Says(kActorChew, 270, 13);
+			Actor_Says(kActorChew, 280, 12);
+			Actor_Says(kActorMcCoy, 870, 18);
+			Actor_Says(kActorChew, 290, 15);
 			if (!Game_Flag_Query(266)) {
-				Actor_Says(52, 300, 12);
+				Actor_Says(kActorChew, 300, 12);
 			}
 		}
-		Actor_Clue_Acquire(0, 67, 1, 52);
+		Actor_Clue_Acquire(kActorMcCoy, kClueChewInterview, 1, kActorChew);
 		break;
 	case 670:
-		Actor_Says(0, 765, 12);
-		Actor_Says(0, 790, 13);
-		Actor_Says(52, 310, 12);
-		Actor_Says(52, 320, 3);
+		Actor_Says(kActorMcCoy, 765, 12);
+		Actor_Says(kActorMcCoy, 790, 13);
+		Actor_Says(kActorChew, 310, 12);
+		Actor_Says(kActorChew, 320, 3);
 		break;
 	case 680:
-		Actor_Says(0, 795, 3);
+		Actor_Says(kActorMcCoy, 795, 3);
 		if (Game_Flag_Query(505) == 1) {
-			Actor_Says(52, 330, 12);
-			Actor_Says(52, 340, 15);
-			Actor_Says(0, 875, 16);
-			Actor_Says(52, 350, 12);
-			Actor_Says(52, 360, 15);
+			Actor_Says(kActorChew, 330, 12);
+			Actor_Says(kActorChew, 340, 15);
+			Actor_Says(kActorMcCoy, 875, 16);
+			Actor_Says(kActorChew, 350, 12);
+			Actor_Says(kActorChew, 360, 15);
 			Game_Flag_Set(326);
 		} else {
-			Actor_Says(52, 320, 13);
-			Actor_Says(52, 150, 14);
+			Actor_Says(kActorChew, 320, 13);
+			Actor_Says(kActorChew, 150, 14);
 			Game_Flag_Set(326);
 		}
 		break;
 	case 1270:
-		Actor_Says(0, 800, 16);
-		Actor_Says(52, 370, 3);
-		Actor_Says(0, 880, 15);
-		Actor_Says(52, 380, 13);
-		Actor_Says(52, 390, 12);
-		Actor_Says(0, 885, 14);
-		Actor_Says(52, 400, 13);
-		Actor_Says(52, 410, 15);
-		Actor_Says(0, 890, 18);
-		Actor_Says(52, 420, 13);
-		Actor_Says(52, 430, 12);
+		Actor_Says(kActorMcCoy, 800, 16);
+		Actor_Says(kActorChew, 370, 3);
+		Actor_Says(kActorMcCoy, 880, 15);
+		Actor_Says(kActorChew, 380, 13);
+		Actor_Says(kActorChew, 390, 12);
+		Actor_Says(kActorMcCoy, 885, 14);
+		Actor_Says(kActorChew, 400, 13);
+		Actor_Says(kActorChew, 410, 15);
+		Actor_Says(kActorMcCoy, 890, 18);
+		Actor_Says(kActorChew, 420, 13);
+		Actor_Says(kActorChew, 430, 12);
 		break;
 	case 690:
-		Actor_Says(0, 805, 3);
+		Actor_Says(kActorMcCoy, 805, 3);
 		break;
 	}
 }