BLADERUNNER: More game constants

1 files changed, 81 insertions, 81 deletions

diff --git a/engines/bladerunner/script/ai/leon.cpp b/engines/bladerunner/script/ai/leon.cpp
index f1f619f382..9d82464708 100644
--- a/engines/bladerunner/script/ai/leon.cpp
+++ b/engines/bladerunner/script/ai/leon.cpp
@@ -29,10 +29,10 @@ void AIScriptLeon::Initialize() {
 	var_45EDA4_y = 0.0f;
 	var_45EDA8_x = 0.0f;
 	var_45EDAC = 0;
-	var_462AF0 = 0;
-	var_462AF4 = 0;
-	var_45EDB4_animation_frame = 0;
-	var_45EDB0_animation_state = 0;
+	_animationStateNext = 0;
+	_animationNext = 0;
+	_animationFrame = 0;
+	_animationState = 0;
 }
 
 bool AIScriptLeon::Update() {
@@ -237,27 +237,27 @@ bool AIScriptLeon::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 
 bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
 
-	switch (var_45EDB0_animation_state) {
+	switch (_animationState) {
 	case 10:
 		*animation = 856;
-		if (var_45EDB4_animation_frame++ == 7) {
+		if (_animationFrame++ == 7) {
 			Actor_Change_Animation_Mode(kActorMcCoy, 48);
 			Actor_Retired_Here(kActorMcCoy, 12, 12, 1, -1);
 		}
-		if (var_45EDB4_animation_frame > Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
+		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			*animation = 847;
-			var_45EDB4_animation_frame = 0;
+			_animationFrame = 0;
 			Actor_Change_Animation_Mode(kActorLeon, 0);
 		}
 		break;
 	case 9:
 		*animation = 849;
-		var_45EDB4_animation_frame++;
-		if (var_45EDB4_animation_frame > Slice_Animation_Query_Number_Of_Frames(849) - 1) {
+		_animationFrame++;
+		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(849) - 1) {
 			Actor_Change_Animation_Mode(kActorLeon, 0);
 			*animation = 847;
-			var_45EDB4_animation_frame = 0;
-			var_45EDB0_animation_state = 0;
+			_animationFrame = 0;
+			_animationState = 0;
 			if (Actor_Query_Goal_Number(kActorLeon) == 2) {
 				Actor_Set_Goal_Number(kActorLeon, 3);
 			}
@@ -265,94 +265,94 @@ bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
 		break;
 	case 8:
 		*animation = 854;
-		var_45EDB4_animation_frame++;
-		if (var_45EDB4_animation_frame > Slice_Animation_Query_Number_Of_Frames(854) - 1) {
-			var_45EDB4_animation_frame = 0;
+		_animationFrame++;
+		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(854) - 1) {
+			_animationFrame = 0;
 		}
 		break;
 	case 7:
 		*animation = 855;
-		var_45EDB4_animation_frame++;
-		if (var_45EDB4_animation_frame > Slice_Animation_Query_Number_Of_Frames(855) - 1) {
-			var_45EDB4_animation_frame = 0;
-			var_45EDB0_animation_state = 6;
+		_animationFrame++;
+		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(855) - 1) {
+			_animationFrame = 0;
+			_animationState = 6;
 			*animation = 854;
 		}
 		break;
 	case 6:
-		if (var_45EDB4_animation_frame == 0 && var_45EDAC != 0) {
+		if (_animationFrame == 0 && var_45EDAC != 0) {
 			Actor_Change_Animation_Mode(kActorLeon, 72);
 			*animation = 848;
 		} else {
 			*animation = 854;
-			var_45EDB4_animation_frame++;
-			if (var_45EDB4_animation_frame > Slice_Animation_Query_Number_Of_Frames(854) - 1) {
-				var_45EDB4_animation_frame = 0;
+			_animationFrame++;
+			if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(854) - 1) {
+				_animationFrame = 0;
 			}
 		}
 		break;
 	case 5:
 		*animation = 853;
-		var_45EDB4_animation_frame++;
-		if (var_45EDB4_animation_frame > Slice_Animation_Query_Number_Of_Frames(853) - 1) {
-			var_45EDB4_animation_frame = 0;
-			var_45EDB0_animation_state = 2;
+		_animationFrame++;
+		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(853) - 1) {
+			_animationFrame = 0;
+			_animationState = 2;
 			*animation = 850;
 		}
 		break;
 	case 4:
 		*animation = 852;
-		var_45EDB4_animation_frame++;
-		if (var_45EDB4_animation_frame > Slice_Animation_Query_Number_Of_Frames(852) - 1) {
-			var_45EDB4_animation_frame = 0;
-			var_45EDB0_animation_state = 2;
+		_animationFrame++;
+		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(852) - 1) {
+			_animationFrame = 0;
+			_animationState = 2;
 			*animation = 850;
 		}
 		break;
 	case 3:
 		*animation = 851;
-		var_45EDB4_animation_frame++;
-		if (var_45EDB4_animation_frame > Slice_Animation_Query_Number_Of_Frames(851) - 1) {
-			var_45EDB4_animation_frame = 0;
-			var_45EDB0_animation_state = 2;
+		_animationFrame++;
+		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(851) - 1) {
+			_animationFrame = 0;
+			_animationState = 2;
 			*animation = 850;
 		}
 		break;
 	case 2:
-		if (!var_45EDB4_animation_frame && var_45EDAC) {
+		if (!_animationFrame && var_45EDAC) {
 			*animation = 847;
-			var_45EDB0_animation_state = 0;
+			_animationState = 0;
 		} else {
 			*animation = 850;
-			var_45EDB4_animation_frame++;
-			if (var_45EDB4_animation_frame > Slice_Animation_Query_Number_Of_Frames(850) - 1) {
-				var_45EDB4_animation_frame = 0;
+			_animationFrame++;
+			if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(850) - 1) {
+				_animationFrame = 0;
 			}
 		}
 		break;
 	case 1:
 		*animation = 846;
-		var_45EDB4_animation_frame++;
-		if (var_45EDB4_animation_frame > Slice_Animation_Query_Number_Of_Frames(846) - 1) {
-			var_45EDB4_animation_frame = 0;
+		_animationFrame++;
+		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(846) - 1) {
+			_animationFrame = 0;
 		}
 		break;
 	case 0:
 		*animation = 847;
-		var_45EDB4_animation_frame++;
-		if (var_45EDB4_animation_frame > Slice_Animation_Query_Number_Of_Frames(847) - 1) {
-			var_45EDB4_animation_frame = 0;
+		_animationFrame++;
+		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(847) - 1) {
+			_animationFrame = 0;
 		}
 		break;
 	}
-	*frame = var_45EDB4_animation_frame;
+	*frame = _animationFrame;
 	return true;
 }
 
 bool AIScriptLeon::ChangeAnimationMode(int mode) {
 	switch (mode) {
 	case 0:
-		switch (var_45EDB0_animation_state) {
+		switch (_animationState) {
 		case 2:
 		case 3:
 		case 4:
@@ -365,75 +365,75 @@ bool AIScriptLeon::ChangeAnimationMode(int mode) {
 			Actor_Change_Animation_Mode(kActorLeon, 72);
 			break;
 		default:
-			var_45EDB0_animation_state = 0;
-			var_45EDB4_animation_frame = 0;
+			_animationState = 0;
+			_animationFrame = 0;
 			break;
 		}
 		break;
 	case 1:
-		var_45EDB0_animation_state = 1;
-		var_45EDB4_animation_frame = 0;
+		_animationState = 1;
+		_animationFrame = 0;
 		break;
 	case 3:
-		var_45EDB0_animation_state = 2;
-		var_45EDB4_animation_frame = 0;
+		_animationState = 2;
+		_animationFrame = 0;
 		var_45EDAC = 0;
 		break;
 	case 6:
-		var_45EDB0_animation_state = 10;
-		var_45EDB4_animation_frame = 0;
+		_animationState = 10;
+		_animationFrame = 0;
 		break;
 	case 12:
-		var_45EDB0_animation_state = 3;
-		var_45EDB4_animation_frame = 0;
+		_animationState = 3;
+		_animationFrame = 0;
 		var_45EDAC = 0;
 		break;
 	case 13:
-		var_45EDB0_animation_state = 4;
-		var_45EDB4_animation_frame = 0;
+		_animationState = 4;
+		_animationFrame = 0;
 		var_45EDAC = 0;
 		break;
 	case 14:
-		var_45EDB0_animation_state = 5;
-		var_45EDB4_animation_frame = 0;
+		_animationState = 5;
+		_animationFrame = 0;
 		var_45EDAC = 0;
 		break;
 	case 15:
-		var_45EDB0_animation_state = 6;
-		var_45EDB4_animation_frame = 0;
+		_animationState = 6;
+		_animationFrame = 0;
 		var_45EDAC = 0;
 		break;
 	case 16:
-		var_45EDB0_animation_state = 7;
-		var_45EDB4_animation_frame = 0;
+		_animationState = 7;
+		_animationFrame = 0;
 		var_45EDAC = 0;
 		break;
 	case 26:
-		var_45EDB0_animation_state = 9;
-		var_45EDB4_animation_frame = 0;
+		_animationState = 9;
+		_animationFrame = 0;
 		break;
 	case 72:
-		if (var_45EDB0_animation_state != 8) {
-			var_45EDB0_animation_state = 8;
-			var_45EDB4_animation_frame = 0;
+		if (_animationState != 8) {
+			_animationState = 8;
+			_animationFrame = 0;
 		}
 		break;
 	}
 	return true;
 }
 
-void AIScriptLeon::QueryAnimationState(int *animationState, int *animationFrame, int *a3, int *a4) {
-	*animationState = var_45EDB0_animation_state;
-	*animationFrame = var_45EDB4_animation_frame;
-	*a3 = var_462AF0;
-	*a4 = var_462AF4;
+void AIScriptLeon::QueryAnimationState(int *animationState, int *animationFrame, int *animationStateNext, int *animationNext) {
+	*animationState     = _animationState;
+	*animationFrame     = _animationFrame;
+	*animationStateNext = _animationStateNext;
+	*animationNext      = _animationNext;
 }
 
-void AIScriptLeon::SetAnimationState(int animationState, int animationFrame, int a3, int a4) {
-	var_45EDB0_animation_state = animationState;
-	var_45EDB4_animation_frame = animationFrame;
-	var_462AF0 = a3;
-	var_462AF4 = a4;
+void AIScriptLeon::SetAnimationState(int animationState, int animationFrame, int animationStateNext, int animationNext) {
+	_animationState     = animationState;
+	_animationFrame     = animationFrame;
+	_animationStateNext = animationStateNext;
+	_animationNext      = animationNext;
 }
 
 bool AIScriptLeon::ReachedMovementTrackWaypoint(int waypointId) {