BLADERUNNER: Replace animation mode values with their proper enums

20 files changed, 54 insertions, 54 deletions

diff --git a/engines/bladerunner/script/ai/chew.cpp b/engines/bladerunner/script/ai/chew.cpp
index fb60c3607c..ce7793f0db 100644
--- a/engines/bladerunner/script/ai/chew.cpp
+++ b/engines/bladerunner/script/ai/chew.cpp
@@ -452,7 +452,7 @@ bool AIScriptChew::ChangeAnimationMode(int mode) {
 
 	case 43:
 		if (_animationState || (!_animationState && _var2 != 1 && _var2 != 2)) {
-			Actor_Change_Animation_Mode(kActorChew, 0);
+			Actor_Change_Animation_Mode(kActorChew, kAnimationModeIdle);
 			_var2 = Random_Query(1, 2);
 		}
 		break;
diff --git a/engines/bladerunner/script/ai/clovis.cpp b/engines/bladerunner/script/ai/clovis.cpp
index d76a84bbf0..27da1d4896 100644
--- a/engines/bladerunner/script/ai/clovis.cpp
+++ b/engines/bladerunner/script/ai/clovis.cpp
@@ -708,7 +708,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 		if (flag) {
 			*animation = 227;
 			_animationState = 0;
-			Actor_Change_Animation_Mode(kActorClovis, 0);
+			Actor_Change_Animation_Mode(kActorClovis, kAnimationModeIdle);
 		}
 		break;
 
@@ -880,7 +880,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 		if (flag) {
 			_animationState = 13;
 			*animation = 208;
-			Actor_Change_Animation_Mode(kActorClovis, 4);
+			Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
 		}
 		break;
 
@@ -901,7 +901,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 		if (flag) {
 			_animationState = 13;
 			*animation = 208;
-			Actor_Change_Animation_Mode(kActorClovis, 4);
+			Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
 		}
 		break;
 
@@ -922,7 +922,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 		if (flag) {
 			_animationState = 13;
 			*animation = 208;
-			Actor_Change_Animation_Mode(kActorClovis, 4);
+			Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
 		}
 		break;
 
@@ -943,7 +943,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 		if (flag) {
 			*animation = 227;
 			_animationState = 0;
-			Actor_Change_Animation_Mode(kActorClovis, 0);
+			Actor_Change_Animation_Mode(kActorClovis, kAnimationModeIdle);
 		}
 		break;
 
@@ -964,7 +964,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 		if (flag) {
 			*animation = 227;
 			_animationState = 0;
-			Actor_Change_Animation_Mode(kActorClovis, 0);
+			Actor_Change_Animation_Mode(kActorClovis, kAnimationModeIdle);
 		}
 		break;
 
@@ -1081,7 +1081,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 		if (flag) {
 			_animationState = 13;
 			*animation = 208;
-			Actor_Change_Animation_Mode(kActorClovis, 4);
+			Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
 		}
 		break;
 
@@ -1102,7 +1102,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 		if (flag) {
 			_animationState = 13;
 			*animation = 208;
-			Actor_Change_Animation_Mode(kActorClovis, 4);
+			Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
 		}
 		break;
 
@@ -1123,7 +1123,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 		if (flag) {
 			*animation = 227;
 			_animationState = 0;
-			Actor_Change_Animation_Mode(kActorClovis, 0);
+			Actor_Change_Animation_Mode(kActorClovis, kAnimationModeIdle);
 		}
 		break;
 
diff --git a/engines/bladerunner/script/ai/early_q.cpp b/engines/bladerunner/script/ai/early_q.cpp
index d78ca824a9..68a2d1cfc1 100644
--- a/engines/bladerunner/script/ai/early_q.cpp
+++ b/engines/bladerunner/script/ai/early_q.cpp
@@ -564,7 +564,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 			*animation = 369;
 			_animationFrame = 0;
 			_animationState = 0;
-			Actor_Change_Animation_Mode(kActorEarlyQ, 0);
+			Actor_Change_Animation_Mode(kActorEarlyQ, kAnimationModeIdle);
 		}
 		break;
 
@@ -692,7 +692,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame = 0;
 			_animationState = 12;
 			*animation = 360;
-			Actor_Change_Animation_Mode(kActorEarlyQ, 4);
+			Actor_Change_Animation_Mode(kActorEarlyQ, kAnimationModeCombatIdle); // TODO: kAnimationModeCombatIdle?
 		}
 		break;
 
@@ -703,7 +703,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 			*animation = 369;
 			_animationFrame = 0;
 			_animationState = 0;
-			Actor_Change_Animation_Mode(kActorEarlyQ, 0);
+			Actor_Change_Animation_Mode(kActorEarlyQ, kAnimationModeIdle);
 		}
 		break;
 
@@ -714,7 +714,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 			*animation = 369;
 			_animationFrame = 0;
 			_animationState = 0;
-			Actor_Change_Animation_Mode(kActorEarlyQ, 0);
+			Actor_Change_Animation_Mode(kActorEarlyQ, kAnimationModeIdle);
 		}
 		break;
 
@@ -725,7 +725,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 			*animation = 369;
 			_animationFrame = 0;
 			_animationState = 0;
-			Actor_Change_Animation_Mode(kActorEarlyQ, 0);
+			Actor_Change_Animation_Mode(kActorEarlyQ, kAnimationModeIdle);
 		}
 		break;
 
@@ -736,7 +736,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 			*animation = 369;
 			_animationFrame = 0;
 			_animationState = 0;
-			Actor_Change_Animation_Mode(kActorEarlyQ, 0);
+			Actor_Change_Animation_Mode(kActorEarlyQ, kAnimationModeIdle);
 		}
 		break;
 
diff --git a/engines/bladerunner/script/ai/early_q_bartender.cpp b/engines/bladerunner/script/ai/early_q_bartender.cpp
index f9f9f6f6bd..f4561e5c74 100644
--- a/engines/bladerunner/script/ai/early_q_bartender.cpp
+++ b/engines/bladerunner/script/ai/early_q_bartender.cpp
@@ -168,7 +168,7 @@ bool AIScriptEarlyQBartender::UpdateAnimation(int *animation, int *frame) {
 		*animation = 754;
 		_animationFrame++;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(754)) {
-			Actor_Change_Animation_Mode(kActorEarlyQBartender, 0);
+			Actor_Change_Animation_Mode(kActorEarlyQBartender, kAnimationModeIdle);
 			*animation = 752;
 			_animationFrame = 0;
 			_animationState = 0;
diff --git a/engines/bladerunner/script/ai/free_slot_b.cpp b/engines/bladerunner/script/ai/free_slot_b.cpp
index c3014b83e3..e6cb0e2dc3 100644
--- a/engines/bladerunner/script/ai/free_slot_b.cpp
+++ b/engines/bladerunner/script/ai/free_slot_b.cpp
@@ -348,7 +348,7 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(860)) {
 			_animationFrame = 0;
 			_animationState = 0;
-			Actor_Change_Animation_Mode(kActorFreeSlotB, 0);
+			Actor_Change_Animation_Mode(kActorFreeSlotB, kAnimationModeIdle);
 		}
 		break;
 
diff --git a/engines/bladerunner/script/ai/hanoi.cpp b/engines/bladerunner/script/ai/hanoi.cpp
index 735f442661..c13e83db3d 100644
--- a/engines/bladerunner/script/ai/hanoi.cpp
+++ b/engines/bladerunner/script/ai/hanoi.cpp
@@ -525,7 +525,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 		}
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
-			Actor_Change_Animation_Mode(kActorHanoi, 4);
+			Actor_Change_Animation_Mode(kActorHanoi, kAnimationModeCombatIdle);
 			_animationFrame = 0;
 			_animationState = 8;
 			*animation = 642;
diff --git a/engines/bladerunner/script/ai/izo.cpp b/engines/bladerunner/script/ai/izo.cpp
index f3bd3f46ec..55f2b9b8a3 100644
--- a/engines/bladerunner/script/ai/izo.cpp
+++ b/engines/bladerunner/script/ai/izo.cpp
@@ -640,7 +640,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame = 0;
 			_animationState = 8;
 			*animation = 277;
-			Actor_Change_Animation_Mode(kActorIzo, 4);
+			Actor_Change_Animation_Mode(kActorIzo, kAnimationModeCombatIdle);
 		}
 		break;
 
@@ -665,7 +665,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame = 0;
 			_animationState = 8;
 			*animation = 277;
-			Actor_Change_Animation_Mode(kActorIzo, 4);
+			Actor_Change_Animation_Mode(kActorIzo, kAnimationModeCombatIdle);
 		}
 		break;
 
@@ -690,7 +690,7 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 				_animationFrame = 0;
 				_animationState = 0;
 				_var4 = 0;
-				Actor_Change_Animation_Mode(kActorIzo, 0);
+				Actor_Change_Animation_Mode(kActorIzo, kAnimationModeIdle);
 			}
 		}
 		break;
diff --git a/engines/bladerunner/script/ai/lucy.cpp b/engines/bladerunner/script/ai/lucy.cpp
index 786d41012d..87d89ad8a1 100644
--- a/engines/bladerunner/script/ai/lucy.cpp
+++ b/engines/bladerunner/script/ai/lucy.cpp
@@ -584,7 +584,7 @@ bool AIScriptLucy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 260;
 			_animationFrame = 0;
 			_animationState = 0;
-			Actor_Change_Animation_Mode(kActorLucy, 0);
+			Actor_Change_Animation_Mode(kActorLucy, kAnimationModeIdle);
 		}
 		break;
 
diff --git a/engines/bladerunner/script/ai/luther.cpp b/engines/bladerunner/script/ai/luther.cpp
index 2957dcc763..9e6f7778a2 100644
--- a/engines/bladerunner/script/ai/luther.cpp
+++ b/engines/bladerunner/script/ai/luther.cpp
@@ -260,7 +260,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 			*animation = 346;
 			_animationFrame = 0;
 			_animationState = 0;
-			Actor_Change_Animation_Mode(kActorLuther, 0);
+			Actor_Change_Animation_Mode(kActorLuther, kAnimationModeIdle);
 		}
 		break;
 
@@ -346,7 +346,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 			*animation = 346;
 			_animationFrame = 0;
 			_animationState = 0;
-			Actor_Change_Animation_Mode(kActorLuther, 0);
+			Actor_Change_Animation_Mode(kActorLuther, kAnimationModeIdle);
 		}
 		break;
 
diff --git a/engines/bladerunner/script/ai/mutant1.cpp b/engines/bladerunner/script/ai/mutant1.cpp
index fcc46cdbc2..657a229906 100644
--- a/engines/bladerunner/script/ai/mutant1.cpp
+++ b/engines/bladerunner/script/ai/mutant1.cpp
@@ -466,7 +466,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 			Actor_Combat_AI_Hit_Attempt(kActorMutant1);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(898)) {
-			Actor_Change_Animation_Mode(kActorMutant1, 0);
+			Actor_Change_Animation_Mode(kActorMutant1, kAnimationModeIdle);
 		}
 		break;
 
@@ -477,7 +477,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 			Ambient_Sounds_Play_Sound(kSfxHURT1M1, 99, 0, 0, 25);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(899)) {
-			Actor_Change_Animation_Mode(kActorMutant1, 0);
+			Actor_Change_Animation_Mode(kActorMutant1, kAnimationModeIdle);
 		}
 		break;
 
@@ -504,7 +504,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 			Sound_Play(kSfxHURT1M1, 100, 0, 0, 50);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(899)) {
-			Actor_Change_Animation_Mode(kActorMutant1, 0);
+			Actor_Change_Animation_Mode(kActorMutant1, kAnimationModeIdle);
 		}
 		break;
 
diff --git a/engines/bladerunner/script/ai/mutant2.cpp b/engines/bladerunner/script/ai/mutant2.cpp
index 6f7f4924a4..e53fd6bc21 100644
--- a/engines/bladerunner/script/ai/mutant2.cpp
+++ b/engines/bladerunner/script/ai/mutant2.cpp
@@ -428,7 +428,7 @@ bool AIScriptMutant2::UpdateAnimation(int *animation, int *frame) {
 			Actor_Combat_AI_Hit_Attempt(kActorMutant2);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(906)) {
-			Actor_Change_Animation_Mode(kActorMutant2, 0);
+			Actor_Change_Animation_Mode(kActorMutant2, kAnimationModeIdle);
 		}
 		break;
 
@@ -456,7 +456,7 @@ bool AIScriptMutant2::UpdateAnimation(int *animation, int *frame) {
 			Sound_Play(kSfxHURT1M2, 100, 0, 0, 50);
 		} else {
 			if (!_animationFrame) {
-				Actor_Change_Animation_Mode(kActorMutant2, 0);
+				Actor_Change_Animation_Mode(kActorMutant2, kAnimationModeIdle);
 			}
 		}
 		break;
diff --git a/engines/bladerunner/script/ai/mutant3.cpp b/engines/bladerunner/script/ai/mutant3.cpp
index 393cf01a2c..fbc41d743f 100644
--- a/engines/bladerunner/script/ai/mutant3.cpp
+++ b/engines/bladerunner/script/ai/mutant3.cpp
@@ -442,7 +442,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
 			Actor_Combat_AI_Hit_Attempt(kActorMutant3);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
-			Actor_Change_Animation_Mode(kActorMutant3, 0);
+			Actor_Change_Animation_Mode(kActorMutant3, kAnimationModeIdle);
 		}
 		break;
 
@@ -495,7 +495,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
 			_var1 = -1;
 		} else {
 			if (!_animationFrame) {
-				Actor_Change_Animation_Mode(kActorMutant3, 0);
+				Actor_Change_Animation_Mode(kActorMutant3, kAnimationModeIdle);
 			}
 		}
 		break;
diff --git a/engines/bladerunner/script/ai/officer_grayford.cpp b/engines/bladerunner/script/ai/officer_grayford.cpp
index 42f02b128e..2d66754907 100644
--- a/engines/bladerunner/script/ai/officer_grayford.cpp
+++ b/engines/bladerunner/script/ai/officer_grayford.cpp
@@ -1119,7 +1119,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(617)) {
 			_animationState = 19;
 			_animationFrame = 0;
-			Actor_Change_Animation_Mode(kActorOfficerGrayford, 4);
+			Actor_Change_Animation_Mode(kActorOfficerGrayford, kAnimationModeCombatIdle);
 		}
 		break;
 
@@ -1147,7 +1147,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame = 0;
 			_animationState = 19;
 			*animation = 625;
-			Actor_Change_Animation_Mode(kActorOfficerGrayford, 4);
+			Actor_Change_Animation_Mode(kActorOfficerGrayford, kAnimationModeCombatIdle);
 		}
 		break;
 
@@ -1158,7 +1158,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame = 0;
 			_animationState = 19;
 			*animation = 625;
-			Actor_Change_Animation_Mode(kActorOfficerGrayford, 4);
+			Actor_Change_Animation_Mode(kActorOfficerGrayford, kAnimationModeCombatIdle);
 		}
 		break;
 
@@ -1304,7 +1304,7 @@ bool AIScriptOfficerGrayford::ChangeAnimationMode(int mode) {
 		case 18:
 			{
 				int tmp = _animationFrame;
-				Actor_Change_Animation_Mode(kActorOfficerGrayford, 4);
+				Actor_Change_Animation_Mode(kActorOfficerGrayford, kAnimationModeCombatIdle);
 				_animationFrame = tmp;
 				_animationState = 19;
 				break;
diff --git a/engines/bladerunner/script/ai/officer_leary.cpp b/engines/bladerunner/script/ai/officer_leary.cpp
index dc1a8af49f..ad3d7ee7b7 100644
--- a/engines/bladerunner/script/ai/officer_leary.cpp
+++ b/engines/bladerunner/script/ai/officer_leary.cpp
@@ -248,7 +248,7 @@ void AIScriptOfficerLeary::CompletedMovementTrack() {
 	}
 	if (goal == 308) {
 		// goal 308 (and 309) are never triggered in the original code
-		Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+		Actor_Change_Animation_Mode(kActorOfficerLeary, kAnimationModeCombatIdle);
 		Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true);
 		Actor_Set_Goal_Number(kActorOfficerLeary, 309);
 	}
@@ -634,7 +634,7 @@ bool AIScriptOfficerLeary::GoalChanged(int currentGoalNumber, int newGoalNumber)
 		// kSetUG07
 		AI_Movement_Track_Flush(kActorOfficerLeary);
 		AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 416, 0, 556);
-		Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+		Actor_Change_Animation_Mode(kActorOfficerLeary, kAnimationModeCombatIdle);
 		AI_Movement_Track_Repeat(kActorOfficerLeary);
 		return true;
 	case 308:
@@ -701,7 +701,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 			*animation = 589;
 			_animationState = 0;
 			_animationFrame = 0;
-			Actor_Change_Animation_Mode(kActorOfficerLeary, 0);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, kAnimationModeIdle);
 		}
 		*frame = _animationFrame;
 		return true;
@@ -712,7 +712,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 			*animation = 589;
 			_animationState = 0;
 			_animationFrame = 0;
-			Actor_Change_Animation_Mode(kActorOfficerLeary, 0);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, kAnimationModeIdle);
 		}
 		*frame = _animationFrame;
 		return true;
@@ -737,7 +737,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 21;
 			_animationFrame = 0;
 			*animation = 571;
-			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, kAnimationModeCombatIdle);
 		}
 		*frame = _animationFrame;
 		return true;
@@ -748,7 +748,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 21;
 			_animationFrame = 0;
 			*animation = 571;
-			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, kAnimationModeCombatIdle);
 		}
 		*frame = _animationFrame;
 		return true;
@@ -769,7 +769,7 @@ bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 			_animationState = 21;
 			_animationFrame = 0;
 			*animation = 571;
-			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, kAnimationModeCombatIdle);
 		}
 		*frame = _animationFrame;
 		return true;
diff --git a/engines/bladerunner/script/ai/rajif.cpp b/engines/bladerunner/script/ai/rajif.cpp
index 3703e74b64..9e4a327032 100644
--- a/engines/bladerunner/script/ai/rajif.cpp
+++ b/engines/bladerunner/script/ai/rajif.cpp
@@ -97,7 +97,7 @@ bool AIScriptRajif::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	if (newGoalNumber == 300) {
 		Actor_Put_In_Set(kActorRajif, kSetMA02_MA04);
 		Actor_Set_At_XYZ(kActorRajif, -73.34f, -140.40f, 342.0f, 300);
-		Actor_Change_Animation_Mode(kActorRajif, 0);
+		Actor_Change_Animation_Mode(kActorRajif, kAnimationModeIdle);
 		return true;
 	}
 
diff --git a/engines/bladerunner/script/ai/sadik.cpp b/engines/bladerunner/script/ai/sadik.cpp
index db6de36b7a..9b08aa5dc8 100644
--- a/engines/bladerunner/script/ai/sadik.cpp
+++ b/engines/bladerunner/script/ai/sadik.cpp
@@ -325,7 +325,7 @@ bool AIScriptSadik::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case kGoalSadikUG18Wait:
 		Actor_Put_In_Set(kActorSadik, kSetUG18);
 		Actor_Set_At_XYZ(kActorSadik, 111.89f, 0.0f, 408.42f, 0);
-		Actor_Change_Animation_Mode(kActorSadik, 4);
+		Actor_Change_Animation_Mode(kActorSadik, kAnimationModeCombatIdle);
 		return true;
 
 	case kGoalSadikUG18Move:
@@ -580,7 +580,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame = 0;
 			_animationState = 7;
 			*animation = 312;
-			Actor_Change_Animation_Mode(kActorSadik, 4);
+			Actor_Change_Animation_Mode(kActorSadik, kAnimationModeCombatIdle);
 		}
 		break;
 
@@ -591,7 +591,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame = 0;
 			_animationState = 7;
 			*animation = 312;
-			Actor_Change_Animation_Mode(kActorSadik, 4);
+			Actor_Change_Animation_Mode(kActorSadik, kAnimationModeCombatIdle);
 		}
 		break;
 
@@ -602,7 +602,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 			*animation = 328;
 			_animationFrame = 0;
 			_animationState = 0;
-			Actor_Change_Animation_Mode(kActorSadik, 0);
+			Actor_Change_Animation_Mode(kActorSadik, kAnimationModeIdle);
 		}
 		break;
 
diff --git a/engines/bladerunner/script/ai/sebastian.cpp b/engines/bladerunner/script/ai/sebastian.cpp
index 64f272e854..2fbeb78930 100644
--- a/engines/bladerunner/script/ai/sebastian.cpp
+++ b/engines/bladerunner/script/ai/sebastian.cpp
@@ -165,7 +165,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
 		*animation = 810;
 		_animationFrame++;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(810) - 1) {
-			Actor_Change_Animation_Mode(kActorSebastian, 0);
+			Actor_Change_Animation_Mode(kActorSebastian, kAnimationModeIdle);
 			*animation = 811;
 			_animationFrame = 0;
 			_animationState = 0;
@@ -181,7 +181,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
 
 	case 4:
 		if (!_animationFrame && _flag) {
-			Actor_Change_Animation_Mode(kActorSebastian, 0);
+			Actor_Change_Animation_Mode(kActorSebastian, kAnimationModeIdle);
 			*animation = 811;
 			_animationState = 0;
 			_animationFrame = 0;
diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp
index 1ee7e5f572..904d266c45 100644
--- a/engines/bladerunner/script/ai/steele.cpp
+++ b/engines/bladerunner/script/ai/steele.cpp
@@ -921,7 +921,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		switch (Actor_Query_Goal_Number(kActorDektora)) {
 		case kGoalDektoraNR11Hiding:
 			Actor_Face_Heading(kActorMcCoy, 954, false);
-			Actor_Change_Animation_Mode(kActorSteele, 4);
+			Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatIdle);
 			Delay(2000);
 			Actor_Says(kActorSteele, 1700, 58);
 			Actor_Says(kActorMcCoy, 3800, 3);
diff --git a/engines/bladerunner/script/scene/rc03.cpp b/engines/bladerunner/script/scene/rc03.cpp
index 7ada145017..d55e944321 100644
--- a/engines/bladerunner/script/scene/rc03.cpp
+++ b/engines/bladerunner/script/scene/rc03.cpp
@@ -334,7 +334,7 @@ void SceneScriptRC03::PlayerWalkedIn() {
 			}
 			Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDodge);
 			Loop_Actor_Walk_To_XYZ(kActorIzo, 180.0f, -4.0f, 184.0f, 0, false, false, false);
-			Actor_Change_Animation_Mode(kActorIzo, 6);
+			Actor_Change_Animation_Mode(kActorIzo, kAnimationModeCombatAttack);
 			if (!Game_Flag_Query(kFlagIzoIsReplicant)) {
 #if BLADERUNNER_ORIGINAL_BUGS
 				Actor_Set_Goal_Number(kActorSteele, kGoalSteeleApprehendIzo);
diff --git a/engines/bladerunner/script/scene/tb07.cpp b/engines/bladerunner/script/scene/tb07.cpp
index cde6e5f6b8..c03281f684 100644
--- a/engines/bladerunner/script/scene/tb07.cpp
+++ b/engines/bladerunner/script/scene/tb07.cpp
@@ -230,7 +230,7 @@ void SceneScriptTB07::McCoyTalkWithRachaelAndTyrell() {
 	Delay(3000);
 	Actor_Put_In_Set(kActorRachael, kSetTB07);
 	Actor_Set_At_XYZ(kActorRachael, -260.15f, 12.0f, -19.16f, 256);
-	Actor_Change_Animation_Mode(kActorRachael, 0);
+	Actor_Change_Animation_Mode(kActorRachael, kAnimationModeIdle);
 	Outtake_Play(kOuttakeRachel, true, -1);
 	Loop_Actor_Walk_To_XYZ(kActorRachael, -146.15f, 12.0f, -5.84f, 0, false, false, false);
 	Actor_Face_Actor(kActorRachael, kActorMcCoy, true);
@@ -285,7 +285,7 @@ void SceneScriptTB07::McCoyTalkWithRachaelAndTyrell() {
 	Actor_Says(kActorRachael, 660, 15);
 	Actor_Put_In_Set(kActorTyrell, kSetTB07);
 	Actor_Set_At_XYZ(kActorTyrell, 68.0f, 12.0f, 288.0f, 0);
-	Actor_Change_Animation_Mode(kActorTyrell, 0);
+	Actor_Change_Animation_Mode(kActorTyrell, kAnimationModeIdle);
 	Scene_Loop_Set_Default(kTB07LoopMainShadeDown);
 	Scene_Loop_Start_Special(kSceneLoopModeOnce, kTB07LoopShadeDrop, false);
 	Actor_Start_Speech_Sample(kActorTyrell, 0);