[Scummvm-git-logs] scummvm master -> 970c54ff58725ec3e15492445cbf5e99115fba3b

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
970c54ff58 BLADERUNNER: Describe Mia Murray animations


Commit: 970c54ff58725ec3e15492445cbf5e99115fba3b
    https://github.com/scummvm/scummvm/commit/970c54ff58725ec3e15492445cbf5e99115fba3b
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2020-12-13T20:13:36+02:00

Commit Message:
BLADERUNNER: Describe Mia Murray animations

Changed paths:
    engines/bladerunner/game_constants.h
    engines/bladerunner/script/ai/mia.cpp
    engines/bladerunner/script/ai/murray.cpp


diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index d6612418a9..44fdd3f4e5 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -2226,7 +2226,11 @@ enum GameModelAnimations {
 	// 555 - 565: Tyrell Guard animations
 		// TODO
 	// 566 - 570: Mia animations
-		// TODO
+	kModelAnimationMiaIdle             = 566,
+	kModelAnimationMiaGestureGive      = 567, // TODO when is this used? animationMode 23
+	kModelAnimationMiaHeadNodTalk      = 568,
+	kModelAnimationMiaMoreCalmTalk     = 569,
+	kModelAnimationMiaHandsOnWaistTalk = 570,
 	// 571 - 604: Officer Leary animations
 	kModelAnimationOfficerLearyCombatIdle             = 571,
 	kModelAnimationOfficerLearyCombatGotHitRight      = 572,
@@ -2362,7 +2366,13 @@ enum GameModelAnimations {
 	kModelAnimationKleinTalkDismissive             = 696,
 	kModelAnimationKleinTalkRaisingBothHands       = 697,
 	// 698 - 704: Murray animations
-		// TODO
+	kModelAnimationMurrayIdle            = 698,
+	kModelAnimationMurrayGestureGive     = 699, // untriggered
+	kModelAnimationMurrayCalmTalk        = 700,
+	kModelAnimationMurrayMoreCalmTalk    = 701,
+	kModelAnimationMurrayExplainTalk     = 702,
+	kModelAnimationMurrayMoreExplainTalk = 703,
+	kModelAnimationMurrayCautionTalk     = 704,
 	// 705 - 715: Hawker's Barkeep animations
 		// TODO
 	// 716 - 721: Holloway animations
diff --git a/engines/bladerunner/script/ai/mia.cpp b/engines/bladerunner/script/ai/mia.cpp
index 9664e2f6d1..8bd1ffd6fb 100644
--- a/engines/bladerunner/script/ai/mia.cpp
+++ b/engines/bladerunner/script/ai/mia.cpp
@@ -110,30 +110,30 @@ bool AIScriptMia::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 bool AIScriptMia::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
-		*animation = 566;
+		*animation = kModelAnimationMiaIdle;
 		++_animationFrame;
 
-		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(566))
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMiaIdle))
 			_animationFrame = 0;
 
 		break;
 
 	case 1:
-		*animation = 567;
+		*animation = kModelAnimationMiaGestureGive;
 		++_animationFrame;
 
-		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(567)) {
-			*animation = 566;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMiaGestureGive)) {
+			*animation = kModelAnimationMiaIdle;
 			_animationFrame = 0;
 			_animationState = 0;
 		}
 		break;
 
 	case 2:
-		*animation = 568;
+		*animation = kModelAnimationMiaHeadNodTalk;
 
 		if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
-			*animation = 566;
+			*animation = kModelAnimationMiaIdle;
 			_animationFrame = 0;
 			_animationState = 0;
 		} else {
@@ -146,22 +146,22 @@ bool AIScriptMia::UpdateAnimation(int *animation, int *frame) {
 		break;
 
 	case 3:
-		*animation = 569;
+		*animation = kModelAnimationMiaMoreCalmTalk;
 		++_animationFrame;
 
-		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(569)) {
-			*animation = 568;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMiaMoreCalmTalk)) {
+			*animation = kModelAnimationMiaHeadNodTalk;
 			_animationFrame = 0;
 			_animationState = 2;
 		}
 		break;
 
 	case 4:
-		*animation = 570;
+		*animation = kModelAnimationMiaHandsOnWaistTalk;
 		++_animationFrame;
 
-		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(570)) {
-			*animation = 568;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMiaHandsOnWaistTalk)) {
+			*animation = kModelAnimationMiaHeadNodTalk;
 			_animationFrame = 0;
 			_animationState = 2;
 		}
diff --git a/engines/bladerunner/script/ai/murray.cpp b/engines/bladerunner/script/ai/murray.cpp
index 7dae758237..a1ccc06ec2 100644
--- a/engines/bladerunner/script/ai/murray.cpp
+++ b/engines/bladerunner/script/ai/murray.cpp
@@ -123,68 +123,68 @@ bool AIScriptMurray::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 bool AIScriptMurray::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
-		*animation = 698;
+		*animation = kModelAnimationMurrayIdle;
 		++_animationFrame;
-		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(698))
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMurrayIdle))
 			_animationFrame = 0;
 		break;
 
 	case 1:
-		*animation = 700;
+		*animation = kModelAnimationMurrayCalmTalk;
 		if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
 			_animationState = 0;
 		} else {
 			++_animationFrame;
-			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(700))
+			if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMurrayCalmTalk))
 				_animationFrame = 0;
 		}
 		break;
 
 	case 2:
-		*animation = 701;
+		*animation = kModelAnimationMurrayMoreCalmTalk;
 		++_animationFrame;
-		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(701)) {
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMurrayMoreCalmTalk)) {
 			_animationFrame = 0;
 			_animationState = 1;
-			*animation = 700;
+			*animation = kModelAnimationMurrayCalmTalk;
 		}
 		break;
 
 	case 3:
-		*animation = 702;
+		*animation = kModelAnimationMurrayExplainTalk;
 		++_animationFrame;
-		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(702)) {
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMurrayExplainTalk)) {
 			_animationFrame = 0;
 			_animationState = 1;
-			*animation = 700;
+			*animation = kModelAnimationMurrayCalmTalk;
 		}
 		break;
 
 	case 4:
-		*animation = 703;
+		*animation = kModelAnimationMurrayMoreExplainTalk;
 		++_animationFrame;
-		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(703)) {
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMurrayMoreExplainTalk)) {
 			_animationFrame = 0;
 			_animationState = 1;
-			*animation = 700;
+			*animation = kModelAnimationMurrayCalmTalk;
 		}
 		break;
 
 	case 5:
-		*animation = 704;
+		*animation = kModelAnimationMurrayCautionTalk;
 		++_animationFrame;
-		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(704)) {
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMurrayCautionTalk)) {
 			_animationFrame = 0;
 			_animationState = 1;
-			*animation = 700;
+			*animation = kModelAnimationMurrayCalmTalk;
 		}
 		break;
 
 	case 6:
-		*animation = 699;
+		*animation = kModelAnimationMurrayGestureGive;
 		++_animationFrame;
-		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(699)) {
-			*animation = 698;
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMurrayGestureGive)) {
+			*animation = kModelAnimationMurrayIdle;
 			_animationFrame = 0;
 			_animationState = 0;
 		}