BLADERUNNER: Named animations for Klein and Hasan

6 files changed, 15 insertions, 15 deletions

diff --git a/engines/bladerunner/script/scene/bb11.cpp b/engines/bladerunner/script/scene/bb11.cpp
index 6ad4c65bc9..381b03d103 100644
--- a/engines/bladerunner/script/scene/bb11.cpp
+++ b/engines/bladerunner/script/scene/bb11.cpp
@@ -44,17 +44,17 @@ void SceneScriptBB11::InitializeScene() {
 	Ambient_Sounds_Add_Sound(kSfxTHNDER4, 5, 180, 50, 100, 0, 0, -101, -101, 0, 0);
 
 	if (Game_Flag_Query(kFlagBB11SadikFight)) {
-		Preload(19);
+		Preload(kModelAnimationMcCoyIdle);
 		Preload(220);
 		Preload(227);
 		Preload(328);
 		Preload(343);
 		Preload(344);
-		Preload(17);
-		Preload(14);
+		Preload(kModelAnimationMcCoyGotHitRight);
+		Preload(kModelAnimationMcCoyRunning);
 		Preload(324);
 		Preload(323);
-		Preload(18);
+		Preload(kModelAnimationMcCoyFallsOnHisBack);
 		Preload(345);
 	}
 }
diff --git a/engines/bladerunner/script/scene/ct02.cpp b/engines/bladerunner/script/scene/ct02.cpp
index 07907d1fff..97efa5113e 100644
--- a/engines/bladerunner/script/scene/ct02.cpp
+++ b/engines/bladerunner/script/scene/ct02.cpp
@@ -96,10 +96,10 @@ void SceneScriptCT02::SceneLoaded() {
 	Unclickable_Object("COFFEJUG IN FOREGRO");
 	Unclickable_Object("BACK-DOOR");
 	if (!Game_Flag_Query(kFlagCT02PotTipped)) {
-		Preload(0);
-		Preload(3);
-		Preload(3);
-		Preload(28);
+		Preload(kModelAnimationMcCoyWithGunIdle);
+		Preload(kModelAnimationMcCoyWithGunWalking);
+		Preload(kModelAnimationMcCoyWithGunWalking); // A bug? Why is this preloaded twice?
+		Preload(kModelAnimationMcCoyDodgeAndDrawGun);
 		Preload(400);
 		Preload(419);
 		Preload(420);
diff --git a/engines/bladerunner/script/scene/ct06.cpp b/engines/bladerunner/script/scene/ct06.cpp
index 1aab6c585a..963a53f6fd 100644
--- a/engines/bladerunner/script/scene/ct06.cpp
+++ b/engines/bladerunner/script/scene/ct06.cpp
@@ -68,8 +68,8 @@ void SceneScriptCT06::SceneLoaded() {
 	Unobstacle_Object("CB BOX04", true);
 	Unclickable_Object("DOOR");
 	if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT06HideAtFreeSlotA) {
-		Preload(3);
-		Preload(4);
+		Preload(kModelAnimationMcCoyWithGunWalking);
+		Preload(kModelAnimationMcCoyWithGunRunning);
 		Preload(389);
 		Preload(390);
 		Preload(398);
diff --git a/engines/bladerunner/script/scene/hc01.cpp b/engines/bladerunner/script/scene/hc01.cpp
index 5fa67213ad..7399346ddf 100644
--- a/engines/bladerunner/script/scene/hc01.cpp
+++ b/engines/bladerunner/script/scene/hc01.cpp
@@ -74,7 +74,7 @@ void SceneScriptHC01::InitializeScene() {
 void SceneScriptHC01::SceneLoaded() {
 	Obstacle_Object("PILLAR", true);
 	if (Game_Flag_Query(kFlagAR01toHC01)) {
-		Preload(19);
+		Preload(kModelAnimationMcCoyIdle);
 		Preload(426);
 		Preload(430);
 		Preload(437);
diff --git a/engines/bladerunner/script/scene/nr01.cpp b/engines/bladerunner/script/scene/nr01.cpp
index 3a0b46d53b..08d62d76ae 100644
--- a/engines/bladerunner/script/scene/nr01.cpp
+++ b/engines/bladerunner/script/scene/nr01.cpp
@@ -37,7 +37,7 @@ void SceneScriptNR01::InitializeScene() {
 	} else if (Game_Flag_Query(kFlagNR01DektoraFall)) {
 		Setup_Scene_Information( -416.0f, 31.93f,  -841.0f, 200);
 		Actor_Set_Invisible(kActorMcCoy, true);
-		Preload(167);
+		Preload(kModelAnimationDektoraInFlamesEndFalling);
 	} else if (Game_Flag_Query(kFlagNR03toNR01)) {
 		Setup_Scene_Information( -416.0f, 31.93f,  -841.0f, 200);
 	} else if (Game_Flag_Query(kFlagUG06toNR01)) {
diff --git a/engines/bladerunner/script/scene/rc01.cpp b/engines/bladerunner/script/scene/rc01.cpp
index 4c0f0b7f87..1c5ba9ac9b 100644
--- a/engines/bladerunner/script/scene/rc01.cpp
+++ b/engines/bladerunner/script/scene/rc01.cpp
@@ -198,9 +198,9 @@ void SceneScriptRC01::SceneLoaded() {
 	}
 
 	if (!Game_Flag_Query(kFlagRC01PoliceDone)) {
-		Preload(13);
-		Preload(14);
-		Preload(19);
+		Preload(kModelAnimationMcCoyWalking);
+		Preload(kModelAnimationMcCoyRunning);
+		Preload(kModelAnimationMcCoyIdle);
 		Preload(582);
 		Preload(589);
 	}