From ea6ae69ac6e2093b7c61cc3d21379be3d13c5af0 Mon Sep 17 00:00:00 2001 From: antoniou79 Date: Mon, 19 Aug 2019 17:39:01 +0300 Subject: BLADERUNNER: Named animations for Klein and Hasan --- engines/bladerunner/script/ai/hasan.cpp | 52 +++++++++++++------------- engines/bladerunner/script/ai/klein.cpp | 66 ++++++++++++++++----------------- engines/bladerunner/script/ai/mccoy.cpp | 2 +- 3 files changed, 60 insertions(+), 60 deletions(-) (limited to 'engines/bladerunner/script/ai') diff --git a/engines/bladerunner/script/ai/hasan.cpp b/engines/bladerunner/script/ai/hasan.cpp index b2386a2fcc..3f48cc113b 100644 --- a/engines/bladerunner/script/ai/hasan.cpp +++ b/engines/bladerunner/script/ai/hasan.cpp @@ -126,15 +126,15 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) { switch (_animationState) { case 0: if (_var6 == 1) { - *animation = 922; + *animation = kModelAnimationHasanTalkSuggest; if (_var3) { _var3--; } else { _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(922)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTalkSuggest)) { _animationFrame = 0; _var6 = 0; - *animation = 921; + *animation = kModelAnimationHasanIdleSlightMovement; _var1 = Random_Query(6, 14); _var2 = 2 * Random_Query(0, 1) - 1; _var4 = Random_Query(40, 60); @@ -144,15 +144,15 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) { } } } else if (_var6 == 2) { - *animation = 923; + *animation = kModelAnimationHasanTakingABiteSnakeMove; if (_var3) { _var3--; } else { _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(923)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTakingABiteSnakeMove)) { _animationFrame = 0; _var6 = 0; - *animation = 921; + *animation = kModelAnimationHasanIdleSlightMovement; _var1 = Random_Query(6, 14); _var2 = 2 * Random_Query(0, 1) - 1; _var5 = Random_Query(40, 60); @@ -165,16 +165,16 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) { } } } else if (_var6 == 0) { - *animation = 921; + *animation = kModelAnimationHasanIdleSlightMovement; if (_var3) { _var3--; } else { _animationFrame += _var2; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(921)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanIdleSlightMovement)) { _animationFrame = 0; } if (_animationFrame < 0) { - _animationFrame = Slice_Animation_Query_Number_Of_Frames(921) - 1; + _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanIdleSlightMovement) - 1; } if (!--_var1) { _var2 = 2 * Random_Query(0, 1) - 1; @@ -195,60 +195,60 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) { break; case 1: - *animation = 925; + *animation = kModelAnimationHasanTalkMovingBothHands; _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(925)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTalkMovingBothHands)) { _animationFrame = 0; } break; case 2: - *animation = 926; + *animation = kModelAnimationHasanTalkLeftRightLeftGesture; _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(926)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTalkLeftRightLeftGesture)) { _animationFrame = 0; _animationState = 1; - *animation = 925; + *animation = kModelAnimationHasanTalkMovingBothHands; } break; case 3: - *animation = 927; + *animation = kModelAnimationHasanTalkRaiseHandSnakeMove; _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(927)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTalkRaiseHandSnakeMove)) { _animationFrame = 0; _animationState = 1; - *animation = 925; + *animation = kModelAnimationHasanTalkMovingBothHands; } break; case 4: - *animation = 928; + *animation = kModelAnimationHasanTalkMovingBothHandsAndNod; _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(928)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTalkMovingBothHandsAndNod)) { _animationFrame = 0; _animationState = 1; - *animation = 925; + *animation = kModelAnimationHasanTalkMovingBothHands; } break; case 5: - *animation = 929; + *animation = kModelAnimationHasanTalkWipeFaceLeftHand02; _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(929)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTalkWipeFaceLeftHand02)) { _animationFrame = 0; _animationState = 1; - *animation = 925; + *animation = kModelAnimationHasanTalkMovingBothHands; } break; case 6: - *animation = 930; + *animation = kModelAnimationHasanTalkUpset; _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(930)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationHasanTalkUpset)) { _animationFrame = 0; _animationState = 1; - *animation = 925; + *animation = kModelAnimationHasanTalkMovingBothHands; } break; diff --git a/engines/bladerunner/script/ai/klein.cpp b/engines/bladerunner/script/ai/klein.cpp index fbb2cdbd79..44bd87281e 100644 --- a/engines/bladerunner/script/ai/klein.cpp +++ b/engines/bladerunner/script/ai/klein.cpp @@ -354,17 +354,17 @@ bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) { if (Actor_Query_Goal_Number(kActorKlein) == kGoalKleinMovingInLab01 || Actor_Query_Goal_Number(kActorKlein) == kGoalKleinMovingInLab02 ) { - *animation = 691; + *animation = kModelAnimationKleinWorkingOnInstruments; _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(691)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinWorkingOnInstruments)) { _animationFrame = 0; } } else if (!Game_Flag_Query(kFlagKleinAnimation1) && Actor_Query_Goal_Number(kActorKlein) == kGoalKleinGotoLabSpeaker ) { - *animation = 689; + *animation = kModelAnimationKleinStandingIdle; _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(689)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinStandingIdle)) { _animationFrame = 0; if (Random_Query(1, 10) == 1) { Game_Flag_Set(kFlagKleinAnimation1); @@ -382,7 +382,7 @@ bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) { ++_animationFrame; } - *animation = 690; + *animation = kModelAnimationKleinTalkScratchBackOfHead; if (_animationFrame <= 9) { if (Game_Flag_Query(kFlagKleinAnimation3)) { Game_Flag_Reset(kFlagKleinAnimation3); @@ -399,69 +399,69 @@ bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) { Game_Flag_Set(kFlagKleinAnimation3); } } - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(690)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinTalkScratchBackOfHead)) { _animationFrame = 0; Game_Flag_Reset(kFlagKleinAnimation1); } } break; case 1: - *animation = 688; + *animation = kModelAnimationKleinWalking; _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(688)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinWalking)) { _animationFrame = 0; } break; case 2: - *animation = 692; + *animation = kModelAnimationKleinTalkSmallLeftHandMove; _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(692)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinTalkSmallLeftHandMove)) { _animationFrame = 0; } break; case 3: - *animation = 693; + *animation = kModelAnimationKleinTalkRightHandTouchFace; _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(693)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinTalkRightHandTouchFace)) { _animationState = 2; _animationFrame = 0; - *animation = 692; + *animation = kModelAnimationKleinTalkSmallLeftHandMove; } break; case 4: - *animation = 694; + *animation = kModelAnimationKleinTalkWideHandMotion; _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(694)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinTalkWideHandMotion)) { _animationState = 2; _animationFrame = 0; - *animation = 692; + *animation = kModelAnimationKleinTalkSmallLeftHandMove; } break; case 5: - *animation = 695; + *animation = kModelAnimationKleinTalkSuggestOrAsk; _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(695)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinTalkSuggestOrAsk)) { _animationState = 2; _animationFrame = 0; - *animation = 692; + *animation = kModelAnimationKleinTalkSmallLeftHandMove; } break; case 6: - *animation = 696; + *animation = kModelAnimationKleinTalkDismissive; _animationFrame++; - if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(696)) { + if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinTalkDismissive)) { _animationState = 2; _animationFrame = 0; - *animation = 692; + *animation = kModelAnimationKleinTalkSmallLeftHandMove; } break; case 7: - *animation = 697; + *animation = kModelAnimationKleinTalkRaisingBothHands; _animationFrame++; - if (_animationFrame>= Slice_Animation_Query_Number_Of_Frames(697)) { + if (_animationFrame>= Slice_Animation_Query_Number_Of_Frames(kModelAnimationKleinTalkRaisingBothHands)) { _animationState = 2; _animationFrame = 0; - *animation = 692; + *animation = kModelAnimationKleinTalkSmallLeftHandMove; } break; case 8: @@ -470,7 +470,7 @@ bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) { _animationState = _animationStateNext; break; default: - *animation = 399; + *animation = 399; // TODO: A bug? This belongs to Zuben break; } *frame = _animationFrame; @@ -490,7 +490,7 @@ bool AIScriptKlein::ChangeAnimationMode(int mode) { } else if (_animationState == 0) { _animationState = 8; _animationStateNext = 1; - _animationNext = 688; + _animationNext = kModelAnimationKleinWalking; } break; case kAnimationModeTalk: @@ -500,7 +500,7 @@ bool AIScriptKlein::ChangeAnimationMode(int mode) { } else { _animationState = 8; _animationStateNext = 2; - _animationNext = 692; + _animationNext = kModelAnimationKleinTalkSmallLeftHandMove; } break; case 12: @@ -510,7 +510,7 @@ bool AIScriptKlein::ChangeAnimationMode(int mode) { } else { _animationState = 8; _animationStateNext = 3; - _animationNext = 693; + _animationNext = kModelAnimationKleinTalkRightHandTouchFace; } break; case 13: @@ -520,7 +520,7 @@ bool AIScriptKlein::ChangeAnimationMode(int mode) { } else { _animationState = 8; _animationStateNext = 4; - _animationNext = 694; + _animationNext = kModelAnimationKleinTalkWideHandMotion; } break; case 14: @@ -530,7 +530,7 @@ bool AIScriptKlein::ChangeAnimationMode(int mode) { } else { _animationState = 8; _animationStateNext = 5; - _animationNext = 695; + _animationNext = kModelAnimationKleinTalkSuggestOrAsk; } break; case 15: @@ -540,7 +540,7 @@ bool AIScriptKlein::ChangeAnimationMode(int mode) { } else { _animationState = 8; _animationStateNext = 6; - _animationNext = 696; + _animationNext = kModelAnimationKleinTalkDismissive; } break; case 16: @@ -550,7 +550,7 @@ bool AIScriptKlein::ChangeAnimationMode(int mode) { } else { _animationState = 8; _animationStateNext = 7; - _animationNext = 697; + _animationNext = kModelAnimationKleinTalkRaisingBothHands; } break; } diff --git a/engines/bladerunner/script/ai/mccoy.cpp b/engines/bladerunner/script/ai/mccoy.cpp index 5ede8c68c2..390af53874 100644 --- a/engines/bladerunner/script/ai/mccoy.cpp +++ b/engines/bladerunner/script/ai/mccoy.cpp @@ -424,7 +424,7 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) { case kGoalMcCoyNR10Fall: Player_Set_Combat_Mode(false); - Preload(18); + Preload(kModelAnimationMcCoyFallsOnHisBack); Set_Enter(kSetNR10, kSceneNR10); Player_Loses_Control(); Actor_Force_Stop_Walking(kActorMcCoy); -- cgit v1.2.3