BLADERUNNER: Gaff scripts cleanup

5 files changed, 10 insertions, 32 deletions

diff --git a/engines/bladerunner/script/scene/kp01.cpp b/engines/bladerunner/script/scene/kp01.cpp
index 8fbccd5ccf..52f7bfb258 100644
--- a/engines/bladerunner/script/scene/kp01.cpp
+++ b/engines/bladerunner/script/scene/kp01.cpp
@@ -166,7 +166,7 @@ void SceneScriptKP01::PlayerWalkedIn() {
 	if (!Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)
 	 && !Game_Flag_Query(714)
 	 &&  Actor_Query_Goal_Number(kActorSteele) == kGoalSteeleKP01Wait
-	 &&  Actor_Query_Goal_Number(kActorSteele) != 599
+	 &&  Actor_Query_Goal_Number(kActorSteele) != kGoalSteeleGone
 	) {
 		Player_Loses_Control();
 		Actor_Set_Goal_Number(kActorSteele, kGoalSteeleKP01TalkToMcCoy);
diff --git a/engines/bladerunner/script/scene/kp06.cpp b/engines/bladerunner/script/scene/kp06.cpp
index 0cd53dfe1a..ab1dbed84f 100644
--- a/engines/bladerunner/script/scene/kp06.cpp
+++ b/engines/bladerunner/script/scene/kp06.cpp
@@ -119,7 +119,7 @@ bool SceneScriptKP06::ClickedOnExit(int exitId) {
 				} else if (Actor_Query_Goal_Number(kActorSteele) == 433) {
 					Actor_Set_Goal_Number(kActorSteele, 499);
 				} else {
-					Actor_Set_Goal_Number(kActorGaff, 499);
+					Actor_Set_Goal_Number(kActorGaff, kGoalGaffGone);
 				}
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -187,7 +187,7 @@ void SceneScriptKP06::PlayerWalkedIn() {
 			//return true;
 			return;
 		} else {
-			Actor_Set_Goal_Number(kActorGaff, 499);
+			Actor_Set_Goal_Number(kActorGaff, kGoalGaffGone);
 			Actor_Face_Actor(kActorGaff, kActorMcCoy, true);
 			Actor_Says(kActorGaff, 220, 13);
 			Actor_Face_Actor(kActorMcCoy, kActorGaff, true);
diff --git a/engines/bladerunner/script/scene/ma02.cpp b/engines/bladerunner/script/scene/ma02.cpp
index b3e93869a9..b749b18357 100644
--- a/engines/bladerunner/script/scene/ma02.cpp
+++ b/engines/bladerunner/script/scene/ma02.cpp
@@ -186,7 +186,7 @@ void SceneScriptMA02::PlayerWalkedIn() {
 	}
 
 	if ( Global_Variable_Query(kVariableChapter) == 5
-	 && !Game_Flag_Query(654)
+	 && !Game_Flag_Query(kFlagMA02Chapter5Started)
 	) {
 		if (Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)) {
 			Actor_Says(kActorMcCoy, 2390, kAnimationModeIdle);
@@ -194,7 +194,7 @@ void SceneScriptMA02::PlayerWalkedIn() {
 		} else {
 			Actor_Says(kActorMcCoy, 2385,  kAnimationModeTalk);
 		}
-		Game_Flag_Set(654);
+		Game_Flag_Set(kFlagMA02Chapter5Started);
 		Autosave_Game(3);
 	}
 
diff --git a/engines/bladerunner/script/scene/ma07.cpp b/engines/bladerunner/script/scene/ma07.cpp
index 2b5c0f43cc..3f5c467d00 100644
--- a/engines/bladerunner/script/scene/ma07.cpp
+++ b/engines/bladerunner/script/scene/ma07.cpp
@@ -121,7 +121,9 @@ void SceneScriptMA07::SceneFrameAdvanced(int frame) {
 }
 
 void SceneScriptMA07::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bool currentSet) {
-	if (actorId == kActorGaff && newGoal == 302) {
+	if (actorId == kActorGaff
+	 && newGoal == kGoalGaffMA07Left
+	) {
 		Scene_Exits_Enable();
 	}
 }
@@ -140,12 +142,12 @@ void SceneScriptMA07::PlayerWalkedIn() {
 		Game_Flag_Reset(kFlagMA06toMA07);
 	}
 
-	if (!Game_Flag_Query(648)
+	if (!Game_Flag_Query(kFlagMA07GaffTalk)
 	 &&  Game_Flag_Query(kFlagUG18GuzzaScene)
 	 &&  Global_Variable_Query(kVariableChapter) == 4
 	) {
 		Scene_Exits_Disable();
-		Actor_Set_Goal_Number(kActorGaff, 300);
+		Actor_Set_Goal_Number(kActorGaff, kGoalGaffMA07Wait);
 	}
 
 	if (Game_Flag_Query(kFlagMcCoyFreedOfAccusations)) {
diff --git a/engines/bladerunner/script/scene/rc01.cpp b/engines/bladerunner/script/scene/rc01.cpp
index 15c4d5e45a..37241cf9f3 100644
--- a/engines/bladerunner/script/scene/rc01.cpp
+++ b/engines/bladerunner/script/scene/rc01.cpp
@@ -51,31 +51,7 @@ void SceneScriptRC01::InitializeScene() {
 	//TODO: not part of game, remove
 	Game_Flag_Set(kFlagIntroPlayed); // force skip intro
 	Game_Flag_Set(kFlagRC02toRC01); // no landing
-	// Game_Flag_Set(kFlagRC01PoliceDone);
-	// Game_Flag_Set(kFlagKIAPrivacyAddon);
-	// Game_Flag_Set(kFlagZubenRetired);
-	// Game_Flag_Set(kFlagSpinnerAtMA01);
-	// Set_Enter(kSetMA02_MA04, kSceneMA04);
-
-	Spinner_Set_Selectable_Destination_Flag(0, true);
-	Spinner_Set_Selectable_Destination_Flag(1, true);
-	Spinner_Set_Selectable_Destination_Flag(2, true);
-	Spinner_Set_Selectable_Destination_Flag(3, true);
-	Spinner_Set_Selectable_Destination_Flag(4, true);
-	Spinner_Set_Selectable_Destination_Flag(5, true);
-	Spinner_Set_Selectable_Destination_Flag(6, true);
-	Spinner_Set_Selectable_Destination_Flag(7, true);
-	Spinner_Set_Selectable_Destination_Flag(8, true);
-	Spinner_Set_Selectable_Destination_Flag(9, true);
-
-	// ESPER_Flag_To_Activate();
-	// Voight_Kampff_Activate(kActorLucy, 50);
-
-	// Global_Variable_Set(kVariableChapter, 2);
-	// Chapter_Enter(2, kSetRC03, kSceneRC03);
-
 	// Set_Enter(kSetPS10_PS11_PS12_PS13, 73);
-
 #endif
 
 	if (!Game_Flag_Query(kFlagIntroPlayed)) {