BLADERUNNER: Added Generic Walker actors

Fixed isseue of duplicating items in world
Fixed fog issue with incorrect rendering in special occasions
Added basic debugger console
Refactored looping code for better readability

20 files changed, 38 insertions, 34 deletions

diff --git a/engines/bladerunner/script/scene/bb02.cpp b/engines/bladerunner/script/scene/bb02.cpp
index a507f4dd67..fed5ee9c0f 100644
--- a/engines/bladerunner/script/scene/bb02.cpp
+++ b/engines/bladerunner/script/scene/bb02.cpp
@@ -100,7 +100,7 @@ bool SceneScriptBB02::ClickedOnExit(int exitId) {
 		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -415.06f, -27.0f, 0, 1, false, 0)) {
 			Player_Loses_Control();
 			if (!Game_Flag_Query(493)) {
-				Scene_Loop_Start_Special(kSceneLoopMode2, 0, true);
+				Scene_Loop_Start_Special(kSceneLoopModeOnce, 0, true);
 			}
 			Game_Flag_Set(332);
 			Game_Flag_Reset(493);
diff --git a/engines/bladerunner/script/scene/ct02.cpp b/engines/bladerunner/script/scene/ct02.cpp
index e94e0ba719..499ad13695 100644
--- a/engines/bladerunner/script/scene/ct02.cpp
+++ b/engines/bladerunner/script/scene/ct02.cpp
@@ -152,7 +152,7 @@ void SceneScriptCT02::sub_401ACC() {
 			Actor_Set_Goal_Number(kActorZuben, 8);
 			Game_Flag_Set(293);
 			Scene_Loop_Set_Default(3);
-			Scene_Loop_Start_Special(kSceneLoopMode2, 2, true);
+			Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, true);
 		}
 		break;
 	case 280:
@@ -165,7 +165,7 @@ void SceneScriptCT02::sub_401ACC() {
 			Actor_Set_Goal_Number(kActorZuben, 8);
 			Game_Flag_Set(293);
 			Scene_Loop_Set_Default(3);
-			Scene_Loop_Start_Special(kSceneLoopMode2, 2, true);
+			Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, true);
 		}
 		break;
 	case 290:
@@ -181,7 +181,7 @@ void SceneScriptCT02::sub_401ACC() {
 			Actor_Set_Goal_Number(kActorZuben, 8);
 			Game_Flag_Set(293);
 			Scene_Loop_Set_Default(3);
-			Scene_Loop_Start_Special(kSceneLoopMode2, 2, true);
+			Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, true);
 		}
 		break;
 	case 300:
@@ -192,7 +192,7 @@ void SceneScriptCT02::sub_401ACC() {
 			Actor_Set_Goal_Number(kActorZuben, 8);
 			Game_Flag_Set(293);
 			Scene_Loop_Set_Default(3);
-			Scene_Loop_Start_Special(kSceneLoopMode2, 2, true);
+			Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, true);
 		}
 		break;
 	}
diff --git a/engines/bladerunner/script/scene/ct12.cpp b/engines/bladerunner/script/scene/ct12.cpp
index e8d3a5b804..5acf2fe898 100644
--- a/engines/bladerunner/script/scene/ct12.cpp
+++ b/engines/bladerunner/script/scene/ct12.cpp
@@ -271,7 +271,7 @@ void SceneScriptCT12::PlayerWalkedIn() {
 }
 
 void SceneScriptCT12::PlayerWalkedOut() {
-	Game_Flag_Reset(443);
+	Game_Flag_Reset(kFlagGenericWalkerWaiting);
 	if (Game_Flag_Query(433)) {
 		Game_Flag_Reset(176);
 		Game_Flag_Set(259);
diff --git a/engines/bladerunner/script/scene/dr04.cpp b/engines/bladerunner/script/scene/dr04.cpp
index 81302e4e3f..937fd105b2 100644
--- a/engines/bladerunner/script/scene/dr04.cpp
+++ b/engines/bladerunner/script/scene/dr04.cpp
@@ -184,7 +184,7 @@ void SceneScriptDR04::SceneFrameAdvanced(int frame) {
 		Game_Flag_Reset(515);
 		Game_Flag_Reset(271);
 		Scene_Loop_Set_Default(1);
-		Scene_Loop_Start_Special(kSceneLoopMode2, 6, true);
+		Scene_Loop_Start_Special(kSceneLoopModeOnce, 6, true);
 		Music_Stop(4);
 		Actor_Set_Goal_Number(kActorMoraji, 99);
 	} else {
@@ -192,7 +192,7 @@ void SceneScriptDR04::SceneFrameAdvanced(int frame) {
 			Game_Flag_Reset(271);
 			Game_Flag_Set(272);
 			Scene_Loop_Set_Default(1);
-			Scene_Loop_Start_Special(kSceneLoopMode2, 6, true);
+			Scene_Loop_Start_Special(kSceneLoopModeOnce, 6, true);
 			Item_Remove_From_World(78);
 		}
 		switch (frame) {
diff --git a/engines/bladerunner/script/scene/hc03.cpp b/engines/bladerunner/script/scene/hc03.cpp
index 092fcca70b..7b89fc6652 100644
--- a/engines/bladerunner/script/scene/hc03.cpp
+++ b/engines/bladerunner/script/scene/hc03.cpp
@@ -100,7 +100,7 @@ bool SceneScriptHC03::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == 121) {
 		if (a2) {
 			Scene_Loop_Set_Default(3);
-			Scene_Loop_Start_Special(kSceneLoopMode2, 2, true);
+			Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, true);
 			Game_Flag_Set(403);
 			Item_Remove_From_World(121);
 			Unobstacle_Object("GPscisGate", true);
@@ -146,7 +146,7 @@ bool SceneScriptHC03::ClickedOnExit(int exitId) {
 				Set_Enter(75, kSceneUG02);
 			} else {
 				Scene_Loop_Set_Default(6);
-				Scene_Loop_Start_Special(kSceneLoopMode2, 5, true);
+				Scene_Loop_Start_Special(kSceneLoopModeOnce, 5, true);
 				Game_Flag_Set(388);
 			}
 		}
diff --git a/engines/bladerunner/script/scene/hf04.cpp b/engines/bladerunner/script/scene/hf04.cpp
index 09a849c781..192d0e92a1 100644
--- a/engines/bladerunner/script/scene/hf04.cpp
+++ b/engines/bladerunner/script/scene/hf04.cpp
@@ -108,14 +108,14 @@ void SceneScriptHF04::SceneFrameAdvanced(int frame) {
 	if (Game_Flag_Query(585)) {
 		Game_Flag_Reset(585);
 		Scene_Loop_Set_Default(3);
-		Scene_Loop_Start_Special(kSceneLoopMode2, 2, true);
+		Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, true);
 		//return true;
 		return;
 	}
 	if (Game_Flag_Query(586)) {
 		Game_Flag_Reset(586);
 		Scene_Loop_Set_Default(0);
-		Scene_Loop_Start_Special(kSceneLoopMode2, 5, true);
+		Scene_Loop_Start_Special(kSceneLoopModeOnce, 5, true);
 		//return true;
 		return;
 	}
diff --git a/engines/bladerunner/script/scene/hf05.cpp b/engines/bladerunner/script/scene/hf05.cpp
index e98bc8c805..ff497ebbe8 100644
--- a/engines/bladerunner/script/scene/hf05.cpp
+++ b/engines/bladerunner/script/scene/hf05.cpp
@@ -92,7 +92,7 @@ bool SceneScriptHF05::ClickedOn3DObject(const char *objectName, bool a2) {
 				Actor_Face_Heading(kActorMcCoy, 0, false);
 				Actor_Change_Animation_Mode(kActorMcCoy, 23);
 				Scene_Loop_Set_Default(5);
-				Scene_Loop_Start_Special(kSceneLoopMode2, 4, true);
+				Scene_Loop_Start_Special(kSceneLoopModeOnce, 4, true);
 				if (sub_4048C0()) {
 					if (sub_4048C0() == 3) {
 						Actor_Face_Heading(kActorDektora, 0, false);
diff --git a/engines/bladerunner/script/scene/hf06.cpp b/engines/bladerunner/script/scene/hf06.cpp
index f06e099406..7a41c9eda2 100644
--- a/engines/bladerunner/script/scene/hf06.cpp
+++ b/engines/bladerunner/script/scene/hf06.cpp
@@ -263,7 +263,7 @@ void SceneScriptHF06::sub_401EF4() {
 	Actor_Change_Animation_Mode(kActorSteele, 6);
 	Delay(500);
 	Scene_Loop_Set_Default(3);
-	Scene_Loop_Start_Special(kSceneLoopMode2, 2, true);
+	Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, true);
 	Sound_Play(562, 50, 0, 0, 50);
 	Game_Flag_Set(559);
 	Scene_Exits_Disable();
diff --git a/engines/bladerunner/script/scene/kp03.cpp b/engines/bladerunner/script/scene/kp03.cpp
index bb8c005240..cb96e8bfe3 100644
--- a/engines/bladerunner/script/scene/kp03.cpp
+++ b/engines/bladerunner/script/scene/kp03.cpp
@@ -69,7 +69,7 @@ bool SceneScriptKP03::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("BRACK MID", objectName) && !Game_Flag_Query(422)) {
 		if (a2) {
 			Scene_Loop_Set_Default(5);
-			Scene_Loop_Start_Special(kSceneLoopMode2, 4, true);
+			Scene_Loop_Start_Special(kSceneLoopModeOnce, 4, true);
 			Actor_Change_Animation_Mode(kActorMcCoy, 39);
 			Actor_Retired_Here(kActorMcCoy, 72, 18, 1, -1);
 			Game_Flag_Set(422);
@@ -90,7 +90,7 @@ bool SceneScriptKP03::ClickedOn3DObject(const char *objectName, bool a2) {
 				Game_Flag_Set(484);
 				Game_Flag_Reset(421);
 				Scene_Loop_Set_Default(7);
-				Scene_Loop_Start_Special(kSceneLoopMode2, 0, false);
+				Scene_Loop_Start_Special(kSceneLoopModeOnce, 0, false);
 				Actor_Voice_Over(1110, kActorVoiceOver);
 				Actor_Voice_Over(1120, kActorVoiceOver);
 			} else {
@@ -178,7 +178,7 @@ void SceneScriptKP03::SceneFrameAdvanced(int frame) {
 		}
 		if (v1 != -1) {
 			Scene_Loop_Set_Default(5);
-			Scene_Loop_Start_Special(kSceneLoopMode2, 4, true);
+			Scene_Loop_Start_Special(kSceneLoopModeOnce, 4, true);
 			Game_Flag_Set(422);
 			Game_Flag_Reset(421);
 			Unclickable_Object("BRACK MID");
@@ -244,7 +244,7 @@ void SceneScriptKP03::sub_401E54() {
 	Game_Flag_Set(484);
 	Game_Flag_Reset(421);
 	Scene_Loop_Set_Default(7);
-	Scene_Loop_Start_Special(kSceneLoopMode2, 7, false);
+	Scene_Loop_Start_Special(kSceneLoopModeOnce, 7, false);
 	Actor_Set_Goal_Number(kActorSteele, 413);
 	Actor_Says(kActorMcCoy, 2195, 14);
 	Ambient_Sounds_Play_Sound(151, 40, -60, -60, 0);
diff --git a/engines/bladerunner/script/scene/ma05.cpp b/engines/bladerunner/script/scene/ma05.cpp
index 519f43e30b..a10086168c 100644
--- a/engines/bladerunner/script/scene/ma05.cpp
+++ b/engines/bladerunner/script/scene/ma05.cpp
@@ -117,7 +117,7 @@ void SceneScriptMA05::PlayerWalkedIn() {
 	Music_Play(2, 52, 0, 2, -1, 0, 0);
 	if ((Random_Query(0, 4) == 1 || (Game_Flag_Query(kFlagChapter1Ending) && !Game_Flag_Query(kFlagChapter1Ended))) && Global_Variable_Query(kVariableChapter) == 1) {
 		Scene_Loop_Set_Default(kMA05LoopMain);
-		Scene_Loop_Start_Special(kSceneLoopMode2, kMA05LoopSpinner, true);
+		Scene_Loop_Start_Special(kSceneLoopModeOnce, kMA05LoopSpinner, true);
 		Sound_Play(69, 100, 0, 0, 50);
 	}
 	if (Game_Flag_Query(kFlagChapter1Ending) && !Game_Flag_Query(kFlagChapter1Ended)) {
diff --git a/engines/bladerunner/script/scene/ma06.cpp b/engines/bladerunner/script/scene/ma06.cpp
index 3f385271e8..cf69ded5f3 100644
--- a/engines/bladerunner/script/scene/ma06.cpp
+++ b/engines/bladerunner/script/scene/ma06.cpp
@@ -134,7 +134,7 @@ void SceneScriptMA06::activateElevator() {
 		Player_Gains_Control();
 		int floor = Elevator_Activate(kElevatorMA);
 		Player_Loses_Control();
-		Scene_Loop_Start_Special(kSceneLoopMode2, 1, true);
+		Scene_Loop_Start_Special(kSceneLoopModeOnce, kMA06LoopMain, true);
 		if (floor > 1) {
 			Game_Flag_Set(kFlagMA06toMA07);
 		} else if (floor == 1) {
diff --git a/engines/bladerunner/script/scene/nr08.cpp b/engines/bladerunner/script/scene/nr08.cpp
index ef54702191..9af74908eb 100644
--- a/engines/bladerunner/script/scene/nr08.cpp
+++ b/engines/bladerunner/script/scene/nr08.cpp
@@ -150,7 +150,7 @@ void SceneScriptNR08::SceneFrameAdvanced(int frame) {
 		Game_Flag_Set(636);
 		Scene_Exits_Disable();
 		Scene_Loop_Set_Default(1);
-		Scene_Loop_Start_Special(kSceneLoopMode2, 3, true);
+		Scene_Loop_Start_Special(kSceneLoopModeOnce, 3, true);
 	}
 	if (frame == 95) {
 		Actor_Put_In_Set(kActorDektora, 91);
diff --git a/engines/bladerunner/script/scene/nr10.cpp b/engines/bladerunner/script/scene/nr10.cpp
index c3f7bd85a7..f580463187 100644
--- a/engines/bladerunner/script/scene/nr10.cpp
+++ b/engines/bladerunner/script/scene/nr10.cpp
@@ -71,7 +71,7 @@ bool SceneScriptNR10::ClickedOn3DObject(const char *objectName, bool a2) {
 		Ambient_Sounds_Remove_Looping_Sound(452, true);
 		Sound_Play(453, 52, 0, 0, 50);
 		Scene_Loop_Set_Default(0);
-		Scene_Loop_Start_Special(kSceneLoopMode2, 0, true);
+		Scene_Loop_Start_Special(kSceneLoopModeOnce, 0, true);
 		Un_Combat_Target_Object("BOX18");
 		Scene_Exits_Enable();
 		return true;
diff --git a/engines/bladerunner/script/scene/nr11.cpp b/engines/bladerunner/script/scene/nr11.cpp
index 20a1706704..95ef4b7d84 100644
--- a/engines/bladerunner/script/scene/nr11.cpp
+++ b/engines/bladerunner/script/scene/nr11.cpp
@@ -122,7 +122,7 @@ bool SceneScriptNR11::ClickedOn3DObject(const char *objectName, bool a2) {
 			}
 			Actor_Set_Goal_Number(kActorMcCoy, 230);
 			Scene_Loop_Set_Default(3);
-			Scene_Loop_Start_Special(kSceneLoopMode2, 2, true);
+			Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, true);
 		} else if (Actor_Query_Goal_Number(kActorDektora) == 250) {
 			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 24.0f, 0.33f, 0.0f, 0, 1, false, 0)) {
 				Actor_Face_XYZ(kActorMcCoy, -180.0f, 0.0f, -170.0f, true);
@@ -260,7 +260,7 @@ void SceneScriptNR11::SceneFrameAdvanced(int frame) {
 		}
 		Actor_Set_Goal_Number(kActorMcCoy, 230);
 		Scene_Loop_Set_Default(3);
-		Scene_Loop_Start_Special(kSceneLoopMode2, 2, true);
+		Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, true);
 		Game_Flag_Reset(635);
 	} else {
 		if (frame < 61 || frame > 120) {
diff --git a/engines/bladerunner/script/scene/rc01.cpp b/engines/bladerunner/script/scene/rc01.cpp
index 11eb28ee86..83d12d0f39 100644
--- a/engines/bladerunner/script/scene/rc01.cpp
+++ b/engines/bladerunner/script/scene/rc01.cpp
@@ -50,12 +50,12 @@ void SceneScriptRC01::InitializeScene() {
 #if BLADERUNNER_DEBUG_GAME
 	//TODO: not part of game, remove
 	Game_Flag_Set(kFlagIntroPlayed); // force skip intro
-	Game_Flag_Set(kFlagRC02toRC01); // no landing
+	 Game_Flag_Set(kFlagRC02toRC01); // no landing
 	// Game_Flag_Set(kFlagRC01PoliceDone);
 	// Game_Flag_Set(kFlagKIAPrivacyAddon);
 	// Game_Flag_Set(kFlagZubenRetired);
 	// Game_Flag_Set(kFlagSpinnerToMA01);
-	// Set_Enter(kSetMA02_MA04, kSceneMA02);
+	// Set_Enter(kSetMA02_MA04, kSceneMA04);
 
 	// Spinner_Set_Selectable_Destination_Flag(0, true);
 	// Spinner_Set_Selectable_Destination_Flag(1, true);
@@ -70,6 +70,10 @@ void SceneScriptRC01::InitializeScene() {
 
 	// ESPER_Flag_To_Activate();
 	// Voight_Kampff_Activate(kActorLucy, 50);
+
+	// Global_Variable_Set(kVariableChapter, 2);
+	// Chapter_Enter(2, kSetRC03, kSceneRC03);
+
 #endif
 
 	if (!Game_Flag_Query(kFlagIntroPlayed)) {
diff --git a/engines/bladerunner/script/scene/tb07.cpp b/engines/bladerunner/script/scene/tb07.cpp
index 21041fdd72..b45bc1e794 100644
--- a/engines/bladerunner/script/scene/tb07.cpp
+++ b/engines/bladerunner/script/scene/tb07.cpp
@@ -254,7 +254,7 @@ void SceneScriptTB07::sub_401B0C() {
 	Actor_Set_At_XYZ(kActorTyrell, 68.0f, 12.0f, 288.0f, 0);
 	Actor_Change_Animation_Mode(kActorTyrell, 0);
 	Scene_Loop_Set_Default(3);
-	Scene_Loop_Start_Special(kSceneLoopMode2, 2, false);
+	Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, false);
 	Actor_Start_Speech_Sample(kActorTyrell, 0);
 	Loop_Actor_Walk_To_XYZ(kActorTyrell, 44.0f, 12.0f, 176.0f, 0, 0, false, 0);
 	Actor_Face_Actor(kActorTyrell, kActorMcCoy, true);
diff --git a/engines/bladerunner/script/scene/ug01.cpp b/engines/bladerunner/script/scene/ug01.cpp
index 8c60aabd38..138f962cfc 100644
--- a/engines/bladerunner/script/scene/ug01.cpp
+++ b/engines/bladerunner/script/scene/ug01.cpp
@@ -80,7 +80,7 @@ bool SceneScriptUG01::ClickedOn3DObject(const char *objectName, bool a2) {
 		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -9.0f, -50.13f, -148.0f, 0, 1, false, 0) && !Game_Flag_Query(324)) {
 			Actor_Says(kActorMcCoy, 8525, 13);
 			Scene_Loop_Set_Default(3);
-			Scene_Loop_Start_Special(kSceneLoopMode2, 2, true);
+			Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, true);
 			Game_Flag_Set(324);
 		} else {
 			Actor_Says(kActorMcCoy, 8525, 13);
diff --git a/engines/bladerunner/script/scene/ug10.cpp b/engines/bladerunner/script/scene/ug10.cpp
index 123693d8ef..bca6765e8f 100644
--- a/engines/bladerunner/script/scene/ug10.cpp
+++ b/engines/bladerunner/script/scene/ug10.cpp
@@ -74,7 +74,7 @@ void SceneScriptUG10::SceneLoaded() {
 	Obstacle_Object("SLUICEGATE_LEVER", true);
 	if (Global_Variable_Query(kVariableChapter) == 4 && !Game_Flag_Query(474) && Game_Flag_Query(172) && !Game_Flag_Query(693)) {
 		Scene_Loop_Set_Default(1);
-		Scene_Loop_Start_Special(kSceneLoopMode2, 6, true);
+		Scene_Loop_Start_Special(kSceneLoopModeOnce, 6, true);
 		Game_Flag_Set(693);
 		//return true;
 	}
@@ -158,13 +158,13 @@ bool SceneScriptUG10::ClickedOn2DRegion(int region) {
 		} else if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 4.98f, 0.38f, 83.15f, 0, 1, false, 0)) {
 			if (Game_Flag_Query(474)) {
 				Scene_Loop_Set_Default(1);
-				Scene_Loop_Start_Special(kSceneLoopMode2, 0, false);
+				Scene_Loop_Start_Special(kSceneLoopModeOnce, 0, false);
 				Game_Flag_Reset(474);
 				Obstacle_Object("BOX01 BRIDGE", true);
 				Player_Loses_Control();
 			} else {
 				Scene_Loop_Set_Default(4);
-				Scene_Loop_Start_Special(kSceneLoopMode2, 3, false);
+				Scene_Loop_Start_Special(kSceneLoopModeOnce, 3, false);
 				Game_Flag_Set(474);
 				Unobstacle_Object("BOX01 BRIDGE", true);
 				Player_Loses_Control();
diff --git a/engines/bladerunner/script/scene/ug13.cpp b/engines/bladerunner/script/scene/ug13.cpp
index 09e33e8b1e..cdfa8ad806 100644
--- a/engines/bladerunner/script/scene/ug13.cpp
+++ b/engines/bladerunner/script/scene/ug13.cpp
@@ -87,13 +87,13 @@ bool SceneScriptUG13::ClickedOn3DObject(const char *objectName, bool a2) {
 		Actor_Face_Object(kActorMcCoy, "BOLLARD", true);
 		if (Game_Flag_Query(431)) {
 			Scene_Loop_Set_Default(1);
-			Scene_Loop_Start_Special(kSceneLoopMode2, 0, false);
+			Scene_Loop_Start_Special(kSceneLoopModeOnce, 0, false);
 			Game_Flag_Reset(431);
 			Game_Flag_Set(436);
 			return true;
 		} else {
 			Scene_Loop_Set_Default(4);
-			Scene_Loop_Start_Special(kSceneLoopMode2, 3, false);
+			Scene_Loop_Start_Special(kSceneLoopModeOnce, 3, false);
 			Game_Flag_Set(431);
 			Scene_Exit_Remove(0);
 			return true;
diff --git a/engines/bladerunner/script/scene/ug15.cpp b/engines/bladerunner/script/scene/ug15.cpp
index 760e9c42f8..8477e5b46f 100644
--- a/engines/bladerunner/script/scene/ug15.cpp
+++ b/engines/bladerunner/script/scene/ug15.cpp
@@ -168,7 +168,7 @@ void SceneScriptUG15::SceneFrameAdvanced(int frame) {
 			Game_Flag_Set(724);
 			Game_Flag_Set(682);
 			Scene_Loop_Set_Default(3);
-			Scene_Loop_Start_Special(kSceneLoopMode2, 2, true);
+			Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, true);
 			Actor_Set_Goal_Number(kActorMcCoy, 390);
 			Actor_Query_XYZ(kActorFreeSlotA, &x, &y, &z);
 			if (-200.0f < x && -62.0f > x) {