BLADERUNNER: introduced some game constants

Game script are more readable now
Fixed name of Officer Leary

1 files changed, 122 insertions, 122 deletions

diff --git a/engines/bladerunner/script/scene/tb02.cpp b/engines/bladerunner/script/scene/tb02.cpp
index c3aa0c207d..801481f4c4 100644
--- a/engines/bladerunner/script/scene/tb02.cpp
+++ b/engines/bladerunner/script/scene/tb02.cpp
@@ -72,11 +72,11 @@ void SceneScriptTB02::InitializeScene() {
 	} else {
 		Scene_Loop_Set_Default(1);
 	}
-	Actor_Put_In_Set(17, 17);
-	Actor_Set_At_XYZ(17, -38.53f, 2.93f, 1475.97f, 673);
+	Actor_Put_In_Set(kActorTyrellGuard, 17);
+	Actor_Set_At_XYZ(kActorTyrellGuard, -38.53f, 2.93f, 1475.97f, 673);
 	if (Global_Variable_Query(1) == 4) {
-		if (Actor_Query_Goal_Number(17) < 300) {
-			Actor_Set_Goal_Number(17, 300);
+		if (Actor_Query_Goal_Number(kActorTyrellGuard) < 300) {
+			Actor_Set_Goal_Number(kActorTyrellGuard, 300);
 		}
 		Scene_Exit_Add_2D_Exit(1, 430, 235, 487, 396, 0);
 	}
@@ -97,49 +97,49 @@ bool SceneScriptTB02::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptTB02::ClickedOnActor(int actorId) {
 	if (actorId == 17) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -76.35f, 0.15f, 1564.2f, 0, 1, false, 0)) {
-			Actor_Face_Actor(0, 17, true);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -76.35f, 0.15f, 1564.2f, 0, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorTyrellGuard, true);
 			int v1 = Global_Variable_Query(1);
 			if (v1 == 2) {
 				if (Game_Flag_Query(450) && !Game_Flag_Query(451)) {
-					Actor_Says(0, 5150, 18);
-					Actor_Says(17, 60, 12);
-					Actor_Says(17, 70, 13);
-					Actor_Says(0, 5155, 13);
-					Actor_Modify_Friendliness_To_Other(17, 0, -1);
+					Actor_Says(kActorMcCoy, 5150, 18);
+					Actor_Says(kActorTyrellGuard, 60, 12);
+					Actor_Says(kActorTyrellGuard, 70, 13);
+					Actor_Says(kActorMcCoy, 5155, 13);
+					Actor_Modify_Friendliness_To_Other(kActorTyrellGuard, kActorMcCoy, -1);
 					return true;
 				}
 				if (!Game_Flag_Query(450) && !Game_Flag_Query(451)) {
 					Game_Flag_Set(450);
-					Actor_Says(0, 5160, 18);
-					Actor_Says(17, 80, 14);
+					Actor_Says(kActorMcCoy, 5160, 18);
+					Actor_Says(kActorTyrellGuard, 80, 14);
 					Scene_Exit_Add_2D_Exit(1, 430, 235, 487, 396, 0);
 					return true;
 				}
 				if (Game_Flag_Query(451)) {
 					sub_402644();
 				} else {
-					Actor_Face_Actor(17, 0, true);
-					Actor_Says(0, 5150, 18);
-					Actor_Says(17, 60, 13);
-					Actor_Says(17, 70, 12);
-					Actor_Says(0, 5155, 13);
-					Actor_Modify_Friendliness_To_Other(17, 0, -1);
-					Actor_Face_Heading(17, 788, false);
+					Actor_Face_Actor(kActorTyrellGuard, kActorMcCoy, true);
+					Actor_Says(kActorMcCoy, 5150, 18);
+					Actor_Says(kActorTyrellGuard, 60, 13);
+					Actor_Says(kActorTyrellGuard, 70, 12);
+					Actor_Says(kActorMcCoy, 5155, 13);
+					Actor_Modify_Friendliness_To_Other(kActorTyrellGuard, kActorMcCoy, -1);
+					Actor_Face_Heading(kActorTyrellGuard, 788, false);
 				}
 				return true;
 			}
 			if (v1 == 3) {
-				Actor_Says(0, 5235, 18);
-				Actor_Says(17, 280, 13);
-				Actor_Says(17, 290, 12);
-				Actor_Says(0, 5240, 18);
-				Actor_Says(17, 300, 12);
+				Actor_Says(kActorMcCoy, 5235, 18);
+				Actor_Says(kActorTyrellGuard, 280, 13);
+				Actor_Says(kActorTyrellGuard, 290, 12);
+				Actor_Says(kActorMcCoy, 5240, 18);
+				Actor_Says(kActorTyrellGuard, 300, 12);
 				return false;
 			}
 			if (v1 == 4) {
-				if (Actor_Query_Goal_Number(17) == 300) {
-					Actor_Set_Goal_Number(17, 301);
+				if (Actor_Query_Goal_Number(kActorTyrellGuard) == 300) {
+					Actor_Set_Goal_Number(kActorTyrellGuard, 301);
 				}
 			}
 		}
@@ -153,18 +153,18 @@ bool SceneScriptTB02::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptTB02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -152.0f, 0.0f, 1774.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1774.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(154);
 			Game_Flag_Reset(450);
 			Set_Enter(17, 83);
-			Async_Actor_Walk_To_XYZ(0, -152.0f, 0.0f, 1890.0f, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1890.0f, 0, false);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -32.0f, 0.0f, 1578.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -32.0f, 0.0f, 1578.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			if (Global_Variable_Query(1) < 4) {
@@ -178,11 +178,11 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -192.0f, 0.0f, 1430.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 800, false);
-			Loop_Actor_Travel_Stairs(0, 9, 0, 0);
-			if (Actor_Query_Goal_Number(17) == 300) {
-				Actor_Set_Goal_Number(17, 301);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -192.0f, 0.0f, 1430.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 800, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 9, 0, 0);
+			if (Actor_Query_Goal_Number(kActorTyrellGuard) == 300) {
+				Actor_Set_Goal_Number(kActorTyrellGuard, 301);
 			} else {
 				Game_Flag_Reset(176);
 				Game_Flag_Reset(182);
@@ -275,19 +275,19 @@ void SceneScriptTB02::PlayerWalkedIn() {
 		return;
 	}
 	if (Game_Flag_Query(155)) {
-		Async_Actor_Walk_To_XYZ(0, -152.0f, 0.0f, 1702.0f, 0, false);
+		Async_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1702.0f, 0, false);
 		Game_Flag_Reset(155);
 	} else if (Game_Flag_Query(95)) {
 		Game_Flag_Reset(95);
 	} else if (Game_Flag_Query(608)) {
 		Game_Flag_Reset(608);
-		if (Actor_Query_Goal_Number(17) == 300) {
-			Actor_Set_Goal_Number(17, 302);
+		if (Actor_Query_Goal_Number(kActorTyrellGuard) == 300) {
+			Actor_Set_Goal_Number(kActorTyrellGuard, 302);
 		}
 		Music_Play(1, 50, 0, 2, -1, 0, 0);
 	} else {
-		Loop_Actor_Travel_Stairs(0, 9, 1, 0);
-		Loop_Actor_Walk_To_XYZ(0, -140.0f, 0.79f, 1470.0f, 0, 0, false, 0);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 9, 1, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -140.0f, 0.79f, 1470.0f, 0, 0, false, 0);
 	}
 	int v0 = Global_Variable_Query(1);
 	if (v0 > 4) {
@@ -297,42 +297,42 @@ void SceneScriptTB02::PlayerWalkedIn() {
 	if (v0 == 2) {
 		if (!Game_Flag_Query(453)) {
 			Player_Loses_Control();
-			Actor_Says(0, 5125, 18);
-			Actor_Says(17, 0, 50);
-			Actor_Says(0, 5130, 13);
-			Actor_Says(17, 10, 15);
+			Actor_Says(kActorMcCoy, 5125, 18);
+			Actor_Says(kActorTyrellGuard, 0, 50);
+			Actor_Says(kActorMcCoy, 5130, 13);
+			Actor_Says(kActorTyrellGuard, 10, 15);
 			Item_Pickup_Spin_Effect(975, 351, 315);
-			Actor_Says(17, 20, 23);
-			Actor_Says(0, 5140, 17);
-			Actor_Says(17, 30, 14);
-			Actor_Says(17, 40, 13);
-			Loop_Actor_Walk_To_XYZ(0, -140.0f, 0.0f, 1586.0f, 12, 0, false, 0);
-			Loop_Actor_Walk_To_XYZ(0, -112.0f, 0.0f, 1586.0f, 12, 0, false, 0);
-			Actor_Face_Actor(0, 17, true);
-			Actor_Face_Actor(17, 0, true);
-			Actor_Says(0, 5145, 13);
-			Actor_Says(17, 50, 15);
-			Actor_Face_Heading(17, 788, false);
-			Actor_Clue_Acquire(0, 45, 1, -1);
+			Actor_Says(kActorTyrellGuard, 20, 23);
+			Actor_Says(kActorMcCoy, 5140, 17);
+			Actor_Says(kActorTyrellGuard, 30, 14);
+			Actor_Says(kActorTyrellGuard, 40, 13);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -140.0f, 0.0f, 1586.0f, 12, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -112.0f, 0.0f, 1586.0f, 12, 0, false, 0);
+			Actor_Face_Actor(kActorMcCoy, kActorTyrellGuard, true);
+			Actor_Face_Actor(kActorTyrellGuard, kActorMcCoy, true);
+			Actor_Says(kActorMcCoy, 5145, 13);
+			Actor_Says(kActorTyrellGuard, 50, 15);
+			Actor_Face_Heading(kActorTyrellGuard, 788, false);
+			Actor_Clue_Acquire(kActorMcCoy, kClueTyrellSecurity, 1, -1);
 			Game_Flag_Set(453);
 			Game_Flag_Set(450);
 			Player_Gains_Control();
-			Loop_Actor_Walk_To_XYZ(0, -138.17f, 0.15f, 1578.32f, 0, 1, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -138.17f, 0.15f, 1578.32f, 0, 1, false, 0);
 		}
 		if (Game_Flag_Query(450)) {
 			Scene_Exit_Add_2D_Exit(1, 430, 235, 487, 396, 0);
 		}
 		if (Game_Flag_Query(451) && !Game_Flag_Query(450)) {
-			Actor_Says(17, 90, 18);
+			Actor_Says(kActorTyrellGuard, 90, 18);
 			Game_Flag_Set(450);
 			Scene_Exit_Add_2D_Exit(1, 430, 235, 487, 396, 0);
 		}
 		if (Game_Flag_Query(451) && !Game_Flag_Query(456)) {
-			Loop_Actor_Walk_To_Actor(1, 0, 36, 1, false);
-			Actor_Says(1, 2220, 14);
-			Actor_Says(0, 5245, 13);
-			Actor_Says(1, 2230, 12);
-			Actor_Says(1, 2240, 13);
+			Loop_Actor_Walk_To_Actor(kActorSteele, kActorMcCoy, 36, 1, false);
+			Actor_Says(kActorSteele, 2220, 14);
+			Actor_Says(kActorMcCoy, 5245, 13);
+			Actor_Says(kActorSteele, 2230, 12);
+			Actor_Says(kActorSteele, 2240, 13);
 			sub_402B50();
 			//return true;
 		}
@@ -340,12 +340,12 @@ void SceneScriptTB02::PlayerWalkedIn() {
 		return;
 	}
 	if (v0 == 3 && !Game_Flag_Query(455)) {
-		Loop_Actor_Walk_To_XYZ(0, -131.28f, 0.79f, 1448.25f, 12, 1, false, 0);
-		Actor_Says(17, 260, 15);
-		Actor_Says(0, 5225, 16);
-		Actor_Says(17, 270, 14);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -131.28f, 0.79f, 1448.25f, 12, 1, false, 0);
+		Actor_Says(kActorTyrellGuard, 260, 15);
+		Actor_Says(kActorMcCoy, 5225, 16);
+		Actor_Says(kActorTyrellGuard, 270, 14);
 		Game_Flag_Set(455);
-		Actor_Modify_Friendliness_To_Other(17, 0, -1);
+		Actor_Modify_Friendliness_To_Other(kActorTyrellGuard, kActorMcCoy, -1);
 	}
 	//return false;
 }
@@ -361,13 +361,13 @@ void SceneScriptTB02::DialogueQueueFlushed(int a1) {
 void SceneScriptTB02::sub_402644() {
 	Dialogue_Menu_Clear_List();
 	DM_Add_To_List_Never_Repeat_Once_Selected(700, 4, 5, 6);
-	if (Actor_Clue_Query(0, 44)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueDragonflyEarring)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(710, 5, 5, 4);
 	}
-	if (Actor_Clue_Query(0, 50) || Actor_Clue_Query(0, 51)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueVictimInformation) || Actor_Clue_Query(kActorMcCoy, kClueAttemptedFileAccess)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(720, 3, 5, 5);
 	}
-	if (Actor_Clue_Query(0, 51)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueAttemptedFileAccess)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(730, 3, 4, 8);
 	}
 	Dialogue_Menu_Add_DONE_To_List(100);
@@ -376,46 +376,46 @@ void SceneScriptTB02::sub_402644() {
 	Dialogue_Menu_Disappear();
 	switch (answer) {
 	case 100:
-		Actor_Says(0, 5145, 13);
-		Actor_Says(17, 50, 15);
+		Actor_Says(kActorMcCoy, 5145, 13);
+		Actor_Says(kActorTyrellGuard, 50, 15);
 		break;
 	case 730:
-		Actor_Says(0, 5180, 16);
-		Actor_Says(17, 240, 12);
-		Actor_Says(0, 5215, 18);
-		Actor_Says(17, 250, 13);
-		Actor_Says(0, 5220, 16);
+		Actor_Says(kActorMcCoy, 5180, 16);
+		Actor_Says(kActorTyrellGuard, 240, 12);
+		Actor_Says(kActorMcCoy, 5215, 18);
+		Actor_Says(kActorTyrellGuard, 250, 13);
+		Actor_Says(kActorMcCoy, 5220, 16);
 		break;
 	case 720:
-		Actor_Says(0, 5175, 12);
-		Actor_Says(17, 210, 14);
-		Actor_Says(0, 5200, 13);
-		Actor_Says(17, 220, 13);
-		Actor_Says(0, 5205, 15);
-		Actor_Says(17, 230, 12);
-		Actor_Says(0, 5210, 12);
+		Actor_Says(kActorMcCoy, 5175, 12);
+		Actor_Says(kActorTyrellGuard, 210, 14);
+		Actor_Says(kActorMcCoy, 5200, 13);
+		Actor_Says(kActorTyrellGuard, 220, 13);
+		Actor_Says(kActorMcCoy, 5205, 15);
+		Actor_Says(kActorTyrellGuard, 230, 12);
+		Actor_Says(kActorMcCoy, 5210, 12);
 		break;
 	case 710:
-		Actor_Says(0, 5170, 12);
-		Actor_Says(17, 180, 12);
-		Actor_Says(17, 190, 14);
+		Actor_Says(kActorMcCoy, 5170, 12);
+		Actor_Says(kActorTyrellGuard, 180, 12);
+		Actor_Says(kActorTyrellGuard, 190, 14);
 		if (Game_Flag_Query(102)) {
-			Actor_Says(0, 5195, 13);
-			Actor_Says(17, 200, 13);
+			Actor_Says(kActorMcCoy, 5195, 13);
+			Actor_Says(kActorTyrellGuard, 200, 13);
 		}
 		break;
 	case 700:
-		Actor_Says(0, 5165, 11);
-		Actor_Says(17, 100, 13);
-		Actor_Says(17, 110, 12);
-		Actor_Says(0, 5185, 15);
-		Actor_Says(17, 120, 12);
-		Actor_Says(17, 130, 14);
-		Actor_Says(0, 5190, 16);
-		Actor_Says(17, 140, 13);
-		Actor_Says(17, 150, 14);
-		Actor_Says(17, 170, 12);
-		Actor_Clue_Acquire(0, 50, 1, 17);
+		Actor_Says(kActorMcCoy, 5165, 11);
+		Actor_Says(kActorTyrellGuard, 100, 13);
+		Actor_Says(kActorTyrellGuard, 110, 12);
+		Actor_Says(kActorMcCoy, 5185, 15);
+		Actor_Says(kActorTyrellGuard, 120, 12);
+		Actor_Says(kActorTyrellGuard, 130, 14);
+		Actor_Says(kActorMcCoy, 5190, 16);
+		Actor_Says(kActorTyrellGuard, 140, 13);
+		Actor_Says(kActorTyrellGuard, 150, 14);
+		Actor_Says(kActorTyrellGuard, 170, 12);
+		Actor_Clue_Acquire(kActorMcCoy, kClueVictimInformation, 1, kActorTyrellGuard);
 		break;
 	}
 }
@@ -430,37 +430,37 @@ void SceneScriptTB02::sub_402B50() {
 	Dialogue_Menu_Disappear();
 	switch (answer) {
 	case 740:
-		Actor_Says(0, 5250, 15);
+		Actor_Says(kActorMcCoy, 5250, 15);
 		if (Game_Flag_Query(48)) {
-			Actor_Says(1, 2250, 12);
-			Actor_Says(1, 2260, 13);
-			Actor_Says(0, 5265, 12);
-			Actor_Says(1, 2270, 16);
-			Actor_Says(1, 2280, 13);
-			Actor_Says(0, 5270, 16);
-			Actor_Says(1, 2290, 14);
-			Actor_Clue_Acquire(0, 52, 1, 1);
-			Actor_Modify_Friendliness_To_Other(1, 0, 1);
+			Actor_Says(kActorSteele, 2250, 12);
+			Actor_Says(kActorSteele, 2260, 13);
+			Actor_Says(kActorMcCoy, 5265, 12);
+			Actor_Says(kActorSteele, 2270, 16);
+			Actor_Says(kActorSteele, 2280, 13);
+			Actor_Says(kActorMcCoy, 5270, 16);
+			Actor_Says(kActorSteele, 2290, 14);
+			Actor_Clue_Acquire(kActorMcCoy, kClueCrystalsCase, 1, kActorSteele);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, 1);
 			Game_Flag_Set(456);
 		} else {
-			Actor_Says(1, 2300, 12);
-			Actor_Says(1, 2310, 15);
-			Actor_Says(0, 5275, 14);
-			Actor_Says(1, 2320, 12);
-			Actor_Says(0, 5280, 13);
-			Actor_Modify_Friendliness_To_Other(1, 0, 1);
+			Actor_Says(kActorSteele, 2300, 12);
+			Actor_Says(kActorSteele, 2310, 15);
+			Actor_Says(kActorMcCoy, 5275, 14);
+			Actor_Says(kActorSteele, 2320, 12);
+			Actor_Says(kActorMcCoy, 5280, 13);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, 1);
 			Game_Flag_Set(456);
 		}
 		break;
 	case 750:
-		Actor_Says(0, 5255, 11);
-		Actor_Says(1, 2330, 13);
-		Actor_Says(1, 2340, 14);
+		Actor_Says(kActorMcCoy, 5255, 11);
+		Actor_Says(kActorSteele, 2330, 13);
+		Actor_Says(kActorSteele, 2340, 14);
 		Game_Flag_Set(456);
 		break;
 	case 100:
-		Actor_Says(1, 2350, 13);
-		Actor_Modify_Friendliness_To_Other(1, 0, -5);
+		Actor_Says(kActorSteele, 2350, 13);
+		Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, -5);
 		Game_Flag_Set(456);
 		break;
 	}