[Scummvm-git-logs] scummvm master -> 8cbf764c5a707366b162e5af4f39a0c2395eb398
antoniou79
a.antoniou79 at gmail.com
Mon Dec 7 15:08:17 UTC 2020
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:
8cbf764c5a BLADERUNNER: Steele and Gordo animation descriptions
Commit: 8cbf764c5a707366b162e5af4f39a0c2395eb398
https://github.com/scummvm/scummvm/commit/8cbf764c5a707366b162e5af4f39a0c2395eb398
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2020-12-07T17:06:49+02:00
Commit Message:
BLADERUNNER: Steele and Gordo animation descriptions
Changed paths:
engines/bladerunner/game_constants.h
engines/bladerunner/script/ai/gordo.cpp
engines/bladerunner/script/ai/steele.cpp
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index ebba2f0ff7..fdfeaecff7 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -1692,62 +1692,142 @@ enum GameItems {
enum GameModelAnimations {
// 0 - 53: McCoy animations
- kModelAnimationMcCoyWithGunIdle = 0,
- kModelAnimationMcCoyWithGunGotHitRight = 1,
- kModelAnimationMcCoyWithGunGotHitLeft = 2,
- kModelAnimationMcCoyWithGunWalking = 3,
- kModelAnimationMcCoyWithGunRunning = 4,
- kModelAnimationMcCoyWithGunShotDead = 5,
- kModelAnimationMcCoyWithGunClimbStairsUp = 6,
- kModelAnimationMcCoyWithGunClimbStairsDown = 7,
- kModelAnimationMcCoyWithGunUnholsterGun = 8,
- kModelAnimationMcCoyWithGunHolsterGun = 9,
- kModelAnimationMcCoyWithGunAiming = 10,
- kModelAnimationMcCoyWithGunStopAimResumeIdle = 11,
- kModelAnimationMcCoyWithGunShooting = 12,
- kModelAnimationMcCoyWalking = 13,
- kModelAnimationMcCoyRunning = 14,
- kModelAnimationMcCoyClimbStairsUp = 15,
- kModelAnimationMcCoyClimbStairsDown = 16,
- kModelAnimationMcCoyGotHitRight = 17,
- kModelAnimationMcCoyFallsOnHisBack = 18,
- kModelAnimationMcCoyIdle = 19,
- kModelAnimationMcCoyProtestingTalk = 20,
- kModelAnimationMcCoyScratchHeadTalk = 21,
- kModelAnimationMcCoyPointingTalk = 22,
- kModelAnimationMcCoyUpsetTalk = 23,
- kModelAnimationMcCoyDismissiveTalk = 24,
- kModelAnimationMcCoyScratchEarTalk = 25,
- kModelAnimationMcCoyHandsOnWaistTalk = 26,
- kModelAnimationMcCoyScratchEarLongerTalk = 27,
- kModelAnimationMcCoyDodgeAndDrawGun = 28,
- kModelAnimationMcCoyLeaningOver = 29,
- kModelAnimationMcCoyThrowsBeggarInTrash = 30,
- kModelAnimationMcCoyDiesInAgony = 31,
- kModelAnimationMcCoyGivesFromPocket = 32,
- kModelAnimationMcCoyLeaningOverSearching = 33,
- kModelAnimationMcCoyLeaningOverResumeIdle = 34,
- kModelAnimationMcCoyEntersSpinner = 35,
- kModelAnimationMcCoyExitsSpinner = 36,
- kModelAnimationMcCoyClimbsLadderUp = 37,
- kModelAnimationMcCoyClimbsLadderDown = 38,
- kModelAnimationMcCoyRecoversFromPassingOut = 39,
- kModelAnimationMcCoyGiveMovement = 40,
- kModelAnimationMcCoySittingToUseConsole = 41,
- kModelAnimationMcCoyWithGunGrabbedByArm0 = 42,
- kModelAnimationMcCoyWithGunGrabbedByArm1 = 43,
- kModelAnimationMcCoyWithGunGrabbedByArmHurt = 44,
- kModelAnimationMcCoyWithGunGrabbedByArmFreed = 45,
- kModelAnimationMcCoyTiedInChairIdle = 46,
- kModelAnimationMcCoyTiedInChairMoving = 47,
- kModelAnimationMcCoyTiedInChairFreed = 48,
- kModelAnimationMcCoyStartled = 49,
- kModelAnimationMcCoyCrouchingDown = 50,
- kModelAnimationMcCoyCrouchedIdle = 51,
- kModelAnimationMcCoyCrouchedGetsUp = 52,
- kModelAnimationMcCoyDrinkingBooze = 53,
+ kModelAnimationMcCoyWithGunIdle = 0,
+ kModelAnimationMcCoyWithGunGotHitRight = 1,
+ kModelAnimationMcCoyWithGunGotHitLeft = 2,
+ kModelAnimationMcCoyWithGunWalking = 3,
+ kModelAnimationMcCoyWithGunRunning = 4,
+ kModelAnimationMcCoyWithGunShotDead = 5,
+ kModelAnimationMcCoyWithGunClimbStairsUp = 6,
+ kModelAnimationMcCoyWithGunClimbStairsDown = 7,
+ kModelAnimationMcCoyWithGunUnholsterGun = 8,
+ kModelAnimationMcCoyWithGunHolsterGun = 9,
+ kModelAnimationMcCoyWithGunAiming = 10,
+ kModelAnimationMcCoyWithGunStopAimResumeIdle = 11,
+ kModelAnimationMcCoyWithGunShooting = 12,
+ kModelAnimationMcCoyWalking = 13,
+ kModelAnimationMcCoyRunning = 14,
+ kModelAnimationMcCoyClimbStairsUp = 15,
+ kModelAnimationMcCoyClimbStairsDown = 16,
+ kModelAnimationMcCoyGotHitRight = 17,
+ kModelAnimationMcCoyFallsOnHisBack = 18,
+ kModelAnimationMcCoyIdle = 19,
+ kModelAnimationMcCoyProtestingTalk = 20,
+ kModelAnimationMcCoyScratchHeadTalk = 21,
+ kModelAnimationMcCoyPointingTalk = 22,
+ kModelAnimationMcCoyUpsetTalk = 23,
+ kModelAnimationMcCoyDismissiveTalk = 24,
+ kModelAnimationMcCoyScratchEarTalk = 25,
+ kModelAnimationMcCoyHandsOnWaistTalk = 26,
+ kModelAnimationMcCoyScratchEarLongerTalk = 27,
+ kModelAnimationMcCoyDodgeAndDrawGun = 28,
+ kModelAnimationMcCoyLeaningOver = 29,
+ kModelAnimationMcCoyThrowsBeggarInTrash = 30,
+ kModelAnimationMcCoyDiesInAgony = 31,
+ kModelAnimationMcCoyGivesFromPocket = 32,
+ kModelAnimationMcCoyLeaningOverSearching = 33,
+ kModelAnimationMcCoyLeaningOverResumeIdle = 34,
+ kModelAnimationMcCoyEntersSpinner = 35,
+ kModelAnimationMcCoyExitsSpinner = 36,
+ kModelAnimationMcCoyClimbsLadderUp = 37,
+ kModelAnimationMcCoyClimbsLadderDown = 38,
+ kModelAnimationMcCoyRecoversFromPassingOut = 39,
+ kModelAnimationMcCoyGiveMovement = 40,
+ kModelAnimationMcCoySittingToUseConsole = 41,
+ kModelAnimationMcCoyWithGunGrabbedByArm0 = 42,
+ kModelAnimationMcCoyWithGunGrabbedByArm1 = 43,
+ kModelAnimationMcCoyWithGunGrabbedByArmHurt = 44,
+ kModelAnimationMcCoyWithGunGrabbedByArmFreed = 45,
+ kModelAnimationMcCoyTiedInChairIdle = 46,
+ kModelAnimationMcCoyTiedInChairMoving = 47,
+ kModelAnimationMcCoyTiedInChairFreed = 48,
+ kModelAnimationMcCoyStartled = 49,
+ kModelAnimationMcCoyCrouchingDown = 50,
+ kModelAnimationMcCoyCrouchedIdle = 51,
+ kModelAnimationMcCoyCrouchedGetsUp = 52,
+ kModelAnimationMcCoyDrinkingBooze = 53,
// 54 - 92: Steele animations
+ kModelAnimationSteeleWithGunIdle = 54,
+ kModelAnimationSteeleWithGunHopASideways = 55, // ??? untriggered
+ kModelAnimationSteeleWithGunHopBSideways = 56, // ??? untriggered
+ kModelAnimationSteeleWithGunGotHitRight = 57,
+ kModelAnimationSteeleWithGunGotHitLeft = 58,
+ kModelAnimationSteeleWithGunWalking = 59,
+ kModelAnimationSteeleWithGunRunning = 60,
+ kModelAnimationSteeleWithGunShotDead = 61,
+ kModelAnimationSteeleWithGunClimbStairsUp = 62,
+ kModelAnimationSteeleWithGunClimbStairsDown = 63,
+ kModelAnimationSteeleWithGunUnholsterGun = 64,
+ kModelAnimationSteeleWithGunHolsterGun = 65,
+ kModelAnimationSteeleWithGunShooting = 66,
+ kModelAnimationSteeleWalking = 67,
+ kModelAnimationSteeleRunning = 68,
+ kModelAnimationSteeleClimbStairsUp = 69,
+ kModelAnimationSteeleClimbStairsDown = 70,
+ kModelAnimationSteeleGotHitRight = 71,
+ kModelAnimationSteeleGotHitLeft = 72,
+ kModelAnimationSteeleShotDead = 73,
+ kModelAnimationSteeleIdle = 74,
+ kModelAnimationSteeleTakeCigPuff = 75,
+ kModelAnimationSteeleThrowCigAndStepOnIt = 76,
+ kModelAnimationSteeleATalk = 77,
+ kModelAnimationSteeleBTalk = 78,
+ kModelAnimationSteeleSmallLeftHandMoveTalk = 79,
+ kModelAnimationSteeleProtestTalk = 80,
+ kModelAnimationSteeleDismissTalk = 81,
+ kModelAnimationSteeleWithGunAimingTalk = 82,
+ kModelAnimationSteeleClimbUpTrapDoor = 83,
+ kModelAnimationSteeleClimbLadderUp = 84, // untriggered
+ kModelAnimationSteeleClimbLadderDown = 85, // untriggered
+ kModelAnimationSteeleHopOffLadderDown = 86, // untriggered
+ kModelAnimationSteeleLookRightThenDropDead = 87, // UNUSED
+ kModelAnimationSteeleWithGunAimingToRightIdle = 88, // Aiming at Gordo
+ kModelAnimationSteeleWithGunAimingToRightTalk = 89,
+ kModelAnimationSteeleWithGunAimingToRightHandHit = 90,
+ kModelAnimationSteeleWithGunAimingToRightHolster = 91,
+ kModelAnimationSteeleWithGunAimingToRightShoot = 92, // Shooting at Gordo
// 93 - 133: Gordo animations
+ kModelAnimationGordoWithGunIdle = 93,
+ kModelAnimationGordoHopASideways = 94, // UNUSED
+ kModelAnimationGordoHopBSideways = 95, // UNUSED
+ kModelAnimationGordoWithGunGotHitRight = 96,
+ kModelAnimationGordoWithGunGotHitLeft = 97,
+ kModelAnimationGordoWithGunWalking = 98,
+ kModelAnimationGordoWithGunRunning = 99,
+ kModelAnimationGordoWithGunShotDead = 100,
+ kModelAnimationGordoWithGunClimbStairsUp = 101,
+ kModelAnimationGordoWithGunClimbStairsDown = 102,
+ kModelAnimationGordoWithGunUnholsterGun = 103,
+ kModelAnimationGordoWithGunHolsterGun = 104,
+ kModelAnimationGordoWithGunShooting = 105,
+ kModelAnimationGordoWithGunJumpingDown = 106,
+ kModelAnimationGordoWalking = 107,
+ kModelAnimationGordoRunning = 108,
+ kModelAnimationGordoClimbStairsUp = 109,
+ kModelAnimationGordoClimbStairsDown = 110,
+ kModelAnimationGordoGotHitRight = 111,
+ kModelAnimationGordoGotHitLeft = 112,
+ kModelAnimationGordoShotDead = 113,
+ kModelAnimationGordoSitting = 114,
+ kModelAnimationGordoWavesGetsUpAndPays = 115,
+ kModelAnimationGordoIdle = 116,
+ kModelAnimationGordoBrushOffShoulder = 117, // talks too?
+ kModelAnimationGordoChecksHand = 118, // talks too?
+ kModelAnimationGordoLeavesSomethingOnCounter = 119,
+ kModelAnimationGordoIdleTalk = 120,
+ kModelAnimationGordoSuggestingTalk = 121,
+ kModelAnimationGordoSuggestAndPointTalk = 122,
+ kModelAnimationGordoSuggestAndDismissTalk = 123,
+ kModelAnimationGordoDismissiveTalk = 124,
+ kModelAnimationGordoUpsetTalk = 125,
+ kModelAnimationGordoExplainAndPointTalk = 126,
+ kModelAnimationGordoAdjustBowtieTalk = 127,
+ kModelAnimationGordoWithGunWithHostageATalk = 128,
+ kModelAnimationGordoWithGunWithHostageBTalk = 129, // hostage pushes his gun-holding hand upwards
+ kModelAnimationGordoWithGunWithHostageCTalk = 130, // shooting hostage?
+ kModelAnimationGordoWithGunWithHostageLetsGo = 131, // hits hostage?
+ kModelAnimationGordoWithGunWithHostageGetsShot = 132, // hits hostage?
+ kModelAnimationGordoSitsLookingAtSomething = 133, // UNUSED
// 134 - 171: Dektora animations
kModelAnimationDektoraCombatIdle = 134,
kModelAnimationDektoraCombatWalkingA = 135,
diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp
index 7a8c3e24cb..a5ef16bfad 100644
--- a/engines/bladerunner/script/ai/gordo.cpp
+++ b/engines/bladerunner/script/ai/gordo.cpp
@@ -739,7 +739,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
case 0:
switch (_state) {
case 0:
- *animation = 116;
+ *animation = kModelAnimationGordoIdle;
if (_counter < _counterTarget) {
_animationFrame += _frameDelta;
if (_animationFrame > _frameMax) {
@@ -783,19 +783,19 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
}
break;
case 1:
- *animation = 117;
+ *animation = kModelAnimationGordoBrushOffShoulder;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(117)) {
- *animation = 116;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoBrushOffShoulder)) {
+ *animation = kModelAnimationGordoIdle;
_animationFrame = 0;
_state = 0;
}
break;
case 2:
- *animation = 118;
+ *animation = kModelAnimationGordoChecksHand;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(118)) {
- *animation = 116;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoChecksHand)) {
+ *animation = kModelAnimationGordoIdle;
_animationFrame = 0;
_state = 0;
}
@@ -806,8 +806,8 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
case 1:
switch (_state) {
case 0:
- *animation = 116;
- if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(116) / 2) {
+ *animation = kModelAnimationGordoIdle;
+ if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoIdle) / 2) {
_animationFrame += 2;
} else {
_animationFrame -= 2;
@@ -819,18 +819,18 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
}
break;
case 1:
- *animation = 117;
+ *animation = kModelAnimationGordoBrushOffShoulder;
_animationFrame += 2;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(117)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoBrushOffShoulder)) {
*animation = _animationNext;
_animationFrame = 0;
_animationState = _animationStateNext;
}
break;
case 2:
- *animation = 118;
+ *animation = kModelAnimationGordoChecksHand;
_animationFrame += 2;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(118)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoChecksHand)) {
*animation = _animationNext;
_animationFrame = 0;
_animationState = _animationStateNext;
@@ -840,7 +840,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
break;
case 2:
- *animation = 114;
+ *animation = kModelAnimationGordoSitting;
if (Random_Query(0, 1)) {
++_animationFrame;
}
@@ -850,10 +850,10 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
break;
case 3:
- *animation = 115;
+ *animation = kModelAnimationGordoWavesGetsUpAndPays;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(115)) {
- *animation = 116;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWavesGetsUpAndPays)) {
+ *animation = kModelAnimationGordoIdle;
_animationState = 0;
_animationFrame = 0;
Actor_Change_Animation_Mode(kActorGordo, kAnimationModeIdle);
@@ -862,9 +862,9 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
break;
case 4:
- *animation = 120;
+ *animation = kModelAnimationGordoIdleTalk;
if (_animationFrame == 0 && var_45B078) {
- *animation = 116;
+ *animation = kModelAnimationGordoIdle;
_animationState = 0;
} else {
++_animationFrame;
@@ -875,117 +875,118 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
break;
case 5:
- *animation = 121;
+ *animation = kModelAnimationGordoSuggestingTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(121)) {
- *animation = 120;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoSuggestingTalk)) {
+ *animation = kModelAnimationGordoIdleTalk;
_animationFrame = 0;
_animationState = 4;
}
break;
case 6:
- *animation = 122;
+ *animation = kModelAnimationGordoSuggestAndPointTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(122)) {
- *animation = 120;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoSuggestAndPointTalk)) {
+ *animation = kModelAnimationGordoIdleTalk;
_animationFrame = 0;
_animationState = 4;
}
break;
case 7:
- *animation = 123;
+ *animation = kModelAnimationGordoSuggestAndDismissTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(123)) {
- *animation = 120;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoSuggestAndDismissTalk)) {
+ *animation = kModelAnimationGordoIdleTalk;
_animationFrame = 0;
_animationState = 4;
}
break;
case 8:
- *animation = 124;
+ *animation = kModelAnimationGordoDismissiveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(124)) {
- *animation = 120;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoDismissiveTalk)) {
+ *animation = kModelAnimationGordoIdleTalk;
_animationFrame = 0;
_animationState = 4;
}
break;
case 9:
- *animation = 125;
+ *animation = kModelAnimationGordoUpsetTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(125)) {
- *animation = 120;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoUpsetTalk)) {
+ *animation = kModelAnimationGordoIdleTalk;
_animationFrame = 0;
_animationState = 4;
}
break;
case 10:
- *animation = 126;
+ *animation = kModelAnimationGordoExplainAndPointTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(126)) {
- *animation = 120;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoExplainAndPointTalk)) {
+ *animation = kModelAnimationGordoIdleTalk;
_animationFrame = 0;
_animationState = 4;
}
break;
case 11:
- *animation = 127;
+ *animation = kModelAnimationGordoAdjustBowtieTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(127)) {
- *animation = 120;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoAdjustBowtieTalk)) {
+ *animation = kModelAnimationGordoIdleTalk;
_animationFrame = 0;
_animationState = 4;
}
break;
case 12:
- *animation = 127;
+ // TODO this case is identical with case 11 (is this correct?)
+ *animation = kModelAnimationGordoAdjustBowtieTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(127)) {
- *animation = 120;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoAdjustBowtieTalk)) {
+ *animation = kModelAnimationGordoIdleTalk;
_animationFrame = 0;
_animationState = 4;
}
break;
case 13:
- *animation = 114;
+ *animation = kModelAnimationGordoSitting;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(114)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoSitting)) {
_animationFrame = 0;
}
break;
case 14:
- *animation = 103;
+ *animation = kModelAnimationGordoWithGunUnholsterGun;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(103)) {
- *animation = 93;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWithGunUnholsterGun)) {
+ *animation = kModelAnimationGordoWithGunIdle;
_animationFrame = 0;
_animationState = 16;
}
break;
case 15:
- *animation = 104;
+ *animation = kModelAnimationGordoWithGunHolsterGun;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(104)) {
- *animation = 116;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWithGunHolsterGun)) {
+ *animation = kModelAnimationGordoIdle;
_animationFrame = 0;
_animationState = 0;
}
break;
case 16:
- *animation = 93;
+ *animation = kModelAnimationGordoWithGunIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(93)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWithGunIdle)) {
_animationFrame = 0;
}
break;
@@ -994,7 +995,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
break;
case 18:
- *animation = 105;
+ *animation = kModelAnimationGordoWithGunShooting;
++_animationFrame;
if (_animationFrame == 1) {
Sound_Play_Speech_Line(kActorGordo, Random_Query(0, 1) ? 9010 : 9015, 75, 0, 99);
@@ -1003,7 +1004,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
Actor_Combat_AI_Hit_Attempt(kActorGordo);
}
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
- *animation = 93;
+ *animation = kModelAnimationGordoWithGunIdle;
_animationFrame = 0;
_animationState = 16;
Actor_Change_Animation_Mode(kActorGordo, kAnimationModeCombatIdle);
@@ -1011,10 +1012,10 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
break;
case 19:
- *animation = 111;
+ *animation = kModelAnimationGordoGotHitRight;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(111)) {
- *animation = 116;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoGotHitRight)) {
+ *animation = kModelAnimationGordoIdle;
_animationFrame = 0;
_animationState = 0;
Actor_Change_Animation_Mode(kActorGordo, kAnimationModeIdle);
@@ -1022,10 +1023,10 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
break;
case 20:
- *animation = 112;
+ *animation = kModelAnimationGordoGotHitLeft;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(112)) {
- *animation = 116;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoGotHitLeft)) {
+ *animation = kModelAnimationGordoIdle;
_animationFrame = 0;
_animationState = 0;
Actor_Change_Animation_Mode(kActorGordo, kAnimationModeIdle);
@@ -1033,10 +1034,10 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
break;
case 21:
- *animation = 96;
+ *animation = kModelAnimationGordoWithGunGotHitRight;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(96)) {
- *animation = 93;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWithGunGotHitRight)) {
+ *animation = kModelAnimationGordoWithGunIdle;
_animationFrame = 0;
_animationState = 16;
Actor_Change_Animation_Mode(kActorGordo, kAnimationModeCombatIdle);
@@ -1044,10 +1045,10 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
break;
case 22:
- *animation = 97;
+ *animation = kModelAnimationGordoWithGunGotHitLeft;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(97)) {
- *animation = 93;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWithGunGotHitLeft)) {
+ *animation = kModelAnimationGordoWithGunIdle;
_animationFrame = 0;
_animationState = 16;
Actor_Change_Animation_Mode(kActorGordo, kAnimationModeCombatIdle);
@@ -1055,88 +1056,88 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
break;
case 23:
- *animation = 113;
- if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(113) - 1) {
+ *animation = kModelAnimationGordoShotDead;
+ if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoShotDead) - 1) {
++_animationFrame;
}
break;
case 24:
- *animation = 100;
- if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(100) - 1) {
+ *animation = kModelAnimationGordoWithGunShotDead;
+ if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWithGunShotDead) - 1) {
++_animationFrame;
}
break;
case 25:
- *animation = 107;
+ *animation = kModelAnimationGordoWalking;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(107)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWalking)) {
_animationFrame = 0;
}
break;
case 26:
- *animation = 108;
+ *animation = kModelAnimationGordoRunning;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(108)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoRunning)) {
_animationFrame = 0;
}
break;
case 27:
- *animation = 98;
+ *animation = kModelAnimationGordoWithGunWalking;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(98)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWithGunWalking)) {
_animationFrame = 0;
}
break;
case 28:
- *animation = 99;
+ *animation = kModelAnimationGordoWithGunRunning;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(99)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWithGunRunning)) {
_animationFrame = 0;
}
break;
case 29:
- *animation = 109;
+ *animation = kModelAnimationGordoClimbStairsUp;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(109)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoClimbStairsUp)) {
_animationFrame = 0;
}
break;
case 30:
- *animation = 110;
+ *animation = kModelAnimationGordoClimbStairsDown;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(110)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoClimbStairsDown)) {
_animationFrame = 0;
}
break;
case 31:
- *animation = 101;
+ *animation = kModelAnimationGordoWithGunClimbStairsUp;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(101)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWithGunClimbStairsUp)) {
_animationFrame = 0;
}
break;
case 32:
- *animation = 102;
+ *animation = kModelAnimationGordoWithGunClimbStairsDown;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(102)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWithGunClimbStairsDown)) {
_animationFrame = 0;
}
break;
case 33:
- *animation = 106;
+ *animation = kModelAnimationGordoWithGunJumpingDown;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(106)) {
- *animation = 93;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWithGunJumpingDown)) {
+ *animation = kModelAnimationGordoWithGunIdle;
_animationState = 16;
_animationFrame = 0;
Actor_Change_Animation_Mode(kActorGordo, kAnimationModeCombatIdle);
@@ -1148,9 +1149,9 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
break;
case 34:
- *animation = 119;
+ *animation = kModelAnimationGordoLeavesSomethingOnCounter;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(119)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoLeavesSomethingOnCounter)) {
if (Game_Flag_Query(kFlagNR02GordoLeaveLighter)) {
Game_Flag_Reset(kFlagNR02GordoLeaveLighter);
if (Game_Flag_Query(kFlagGordoIsReplicant)) {
@@ -1160,7 +1161,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
}
Actor_Set_Goal_Number(kActorGordo, kGoalGordoNR02GoToPodium);
}
- *animation = 116;
+ *animation = kModelAnimationGordoIdle;
_animationState = 0;
_animationFrame = 0;
Actor_Change_Animation_Mode(kActorGordo, kAnimationModeIdle);
@@ -1168,9 +1169,9 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
break;
case 35:
- *animation = 128;
+ *animation = kModelAnimationGordoWithGunWithHostageATalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(128)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWithGunWithHostageATalk)) {
_animationFrame = 0;
}
break;
@@ -1178,12 +1179,12 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
case 36:
if (_animationFrame == 0 && var_45B078) {
Actor_Change_Animation_Mode(kActorGordo, 80);
- *animation = 128;
+ *animation = kModelAnimationGordoWithGunWithHostageATalk;
_animationState = 35;
} else {
- *animation = 129;
+ *animation = kModelAnimationGordoWithGunWithHostageBTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(129)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWithGunWithHostageBTalk)) {
_animationFrame = 0;
}
}
@@ -1192,19 +1193,19 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
case 37:
if (_animationFrame == 0 && var_45B078) {
Actor_Change_Animation_Mode(kActorGordo, 80);
- *animation = 128;
+ *animation = kModelAnimationGordoWithGunWithHostageATalk;
_animationState = 35;
} else {
- *animation = 130;
+ *animation = kModelAnimationGordoWithGunWithHostageCTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(130)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGordoWithGunWithHostageCTalk)) {
_animationFrame = 0;
}
}
break;
case 38:
- *animation = 131;
+ *animation = kModelAnimationGordoWithGunWithHostageLetsGo;
++_animationFrame;
if (_animationFrame == 7) {
if (Actor_Query_Goal_Number(kActorGordo) == kGoalGordoNR01HostageDie) {
@@ -1215,19 +1216,19 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
}
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
Actor_Change_Animation_Mode(kActorGordo, kAnimationModeCombatIdle);
- *animation = 93;
+ *animation = kModelAnimationGordoWithGunIdle;
_animationFrame = 0;
Actor_Set_Goal_Number(kActorGordo, kGoalGordoNR01RunAway);
}
break;
case 39:
- *animation = 132;
+ *animation = kModelAnimationGordoWithGunWithHostageGetsShot;
++_animationFrame;
if (_animationFrame == 6) {
Actor_Set_Goal_Number(kActorTaffyPatron, 250);
Actor_Change_Animation_Mode(kActorGordo, kAnimationModeCombatDie);
- *animation = 100;
+ *animation = kModelAnimationGordoWithGunShotDead;
_animationFrame = 0;
_animationState = 24;
}
@@ -1286,7 +1287,7 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
} else {
_animationState = 1;
_animationStateNext = 4;
- _animationNext = 120;
+ _animationNext = kModelAnimationGordoIdleTalk;
}
var_45B078 = 0;
break;
@@ -1337,7 +1338,7 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
} else {
_animationState = 1;
_animationStateNext = 5;
- _animationNext = 121;
+ _animationNext = kModelAnimationGordoSuggestingTalk;
}
var_45B078 = 0;
break;
@@ -1349,7 +1350,7 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
} else {
_animationState = 1;
_animationStateNext = 6;
- _animationNext = 122;
+ _animationNext = kModelAnimationGordoSuggestAndPointTalk;
}
var_45B078 = 0;
break;
@@ -1361,7 +1362,7 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
} else {
_animationState = 1;
_animationStateNext = 7;
- _animationNext = 123;
+ _animationNext = kModelAnimationGordoSuggestAndDismissTalk;
}
var_45B078 = 0;
break;
@@ -1373,7 +1374,7 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
} else {
_animationState = 1;
_animationStateNext = 8;
- _animationNext = 124;
+ _animationNext = kModelAnimationGordoDismissiveTalk;
}
var_45B078 = 0;
break;
@@ -1385,7 +1386,7 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
} else {
_animationState = 1;
_animationStateNext = 9;
- _animationNext = 125;
+ _animationNext = kModelAnimationGordoUpsetTalk;
}
var_45B078 = 0;
break;
@@ -1397,7 +1398,7 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
} else {
_animationState = 1;
_animationStateNext = 10;
- _animationNext = 126;
+ _animationNext = kModelAnimationGordoExplainAndPointTalk;
}
var_45B078 = 0;
break;
@@ -1409,7 +1410,7 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
} else {
_animationState = 1;
_animationStateNext = 11;
- _animationNext = 127;
+ _animationNext = kModelAnimationGordoAdjustBowtieTalk;
}
var_45B078 = 0;
break;
@@ -1421,7 +1422,7 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
} else {
_animationState = 1;
_animationStateNext = 12;
- _animationNext = 127;
+ _animationNext = kModelAnimationGordoAdjustBowtieTalk;
}
var_45B078 = 0;
break;
diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp
index a8e89a3d6c..395c1e88d6 100644
--- a/engines/bladerunner/script/ai/steele.cpp
+++ b/engines/bladerunner/script/ai/steele.cpp
@@ -1502,9 +1502,9 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
case 0:
switch (_var1) {
case 0:
- *animation = 74;
+ *animation = kModelAnimationSteeleIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(74)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationSteeleIdle)) {
_animationFrame = 0;
if (Game_Flag_Query(kFlagSteeleSmoking)) {
_animationState = 41;
@@ -1522,9 +1522,9 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 3:
- *animation = 88;
+ *animation = kModelAnimationSteeleWithGunAimingToRightIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(88)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationSteeleWithGunAimingToRightIdle)) {
_animationFrame = 0;
}
break;
@@ -1538,7 +1538,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 2:
- *animation = 67;
+ *animation = kModelAnimationSteeleWalking;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
_animationFrame = 0;
@@ -1546,7 +1546,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 3:
- *animation = 68;
+ *animation = kModelAnimationSteeleRunning;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
_animationFrame = 0;
@@ -1554,7 +1554,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 4:
- *animation = 59;
+ *animation = kModelAnimationSteeleWithGunWalking;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
_animationFrame = 0;
@@ -1562,7 +1562,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 5:
- *animation = 60;
+ *animation = kModelAnimationSteeleWithGunRunning;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
_animationFrame = 0;
@@ -1570,7 +1570,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 6:
- *animation = 69;
+ *animation = kModelAnimationSteeleClimbStairsUp;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
_animationFrame = 0;
@@ -1578,7 +1578,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 7:
- *animation = 70;
+ *animation = kModelAnimationSteeleClimbStairsDown;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
_animationFrame = 0;
@@ -1586,7 +1586,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 8:
- *animation = 62;
+ *animation = kModelAnimationSteeleWithGunClimbStairsUp;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
_animationFrame = 0;
@@ -1594,7 +1594,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 9:
- *animation = 63;
+ *animation = kModelAnimationSteeleWithGunClimbStairsDown;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
_animationFrame = 0;
@@ -1602,11 +1602,11 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 10:
- *animation = 83;
+ *animation = kModelAnimationSteeleClimbUpTrapDoor;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
Actor_Change_Animation_Mode(kActorSteele, kAnimationModeIdle);
- *animation = 74;
+ *animation = kModelAnimationSteeleIdle;
_animationFrame = 0;
_animationState = 0;
if (Actor_Query_Goal_Number(kActorSteele) == kGoalSteeleNR11Enter) {
@@ -1616,7 +1616,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 11:
- *animation = 84;
+ *animation = kModelAnimationSteeleClimbLadderUp;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
_animationFrame = 0;
@@ -1624,7 +1624,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 12:
- *animation = 85;
+ *animation = kModelAnimationSteeleClimbLadderDown;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
_animationFrame = 0;
@@ -1632,7 +1632,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 13:
- *animation = 86;
+ *animation = kModelAnimationSteeleHopOffLadderDown;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
_animationFrame = 0;
@@ -1641,11 +1641,11 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 14:
- *animation = 77;
+ *animation = kModelAnimationSteeleATalk;
if (_animationFrame == 0
&& _flag
) {
- *animation = 74;
+ *animation = kModelAnimationSteeleIdle;
_animationFrame = 0;
_animationState = 0;
_flag = 0;
@@ -1658,63 +1658,63 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 15:
- *animation = 78;
+ *animation = kModelAnimationSteeleBTalk;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
_animationState = 14;
- *animation = 77;
+ *animation = kModelAnimationSteeleATalk;
}
break;
case 16:
- *animation = 79;
+ *animation = kModelAnimationSteeleSmallLeftHandMoveTalk;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
_animationState = 14;
- *animation = 77;
+ *animation = kModelAnimationSteeleATalk;
}
break;
case 17:
- *animation = 80;
+ *animation = kModelAnimationSteeleProtestTalk;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
_animationState = 14;
- *animation = 77;
+ *animation = kModelAnimationSteeleATalk;
}
break;
case 18:
- *animation = 81;
+ *animation = kModelAnimationSteeleDismissTalk;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
_animationState = 14;
- *animation = 77;
+ *animation = kModelAnimationSteeleATalk;
}
break;
case 19:
- *animation = 81;
+ *animation = kModelAnimationSteeleDismissTalk;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
_animationState = 14;
- *animation = 77;
+ *animation = kModelAnimationSteeleATalk;
}
break;
case 20:
- *animation = 82;
+ *animation = kModelAnimationSteeleWithGunAimingTalk;
if (_animationFrame == 0
&& _flag
) {
_animationFrame = 0;
_animationState = 23;
- *animation = 66;
+ *animation = kModelAnimationSteeleWithGunShooting;
Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatIdle);
_flag = 0;
} else {
@@ -1726,27 +1726,27 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 21:
- *animation = 82;
+ *animation = kModelAnimationSteeleWithGunAimingTalk;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
_animationState = 20;
- *animation = 82;
+ *animation = kModelAnimationSteeleWithGunAimingTalk;
}
break;
case 22:
- *animation = 82;
+ *animation = kModelAnimationSteeleWithGunAimingTalk;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
_animationState = 20;
- *animation = 82;
+ *animation = kModelAnimationSteeleWithGunAimingTalk;
}
break;
case 23:
- *animation = 54;
+ *animation = kModelAnimationSteeleWithGunIdle;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
@@ -1754,27 +1754,27 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 24:
- *animation = 65;
+ *animation = kModelAnimationSteeleWithGunHolsterGun;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
- *animation = 74;
+ *animation = kModelAnimationSteeleIdle;
_animationFrame = 0;
_animationState = 0;
}
break;
case 25:
- *animation = 64;
+ *animation = kModelAnimationSteeleWithGunUnholsterGun;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
_animationState = 23;
- *animation = 54;
+ *animation = kModelAnimationSteeleWithGunIdle;
}
break;
case 26:
- *animation = 66;
+ *animation = kModelAnimationSteeleWithGunShooting;
++_animationFrame;
if (_animationFrame == 3) {
int snd;
@@ -1793,66 +1793,66 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
_animationState = 23;
- *animation = 54;
+ *animation = kModelAnimationSteeleWithGunIdle;
Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatIdle);
if (Actor_Query_Goal_Number(kActorSteele) == kGoalSteeleNR11Shoot) {
Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatAttack);
_animationState = 26;
_animationFrame = 0;
- *animation = 66;
+ *animation = kModelAnimationSteeleWithGunShooting;
}
}
break;
case 27:
- *animation = 55;
+ *animation = kModelAnimationSteeleWithGunHopASideways;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
_animationState = 23;
- *animation = 54;
+ *animation = kModelAnimationSteeleWithGunIdle;
Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatIdle);
}
break;
case 28:
- *animation = 56;
+ *animation = kModelAnimationSteeleWithGunHopBSideways;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
_animationState = 23;
- *animation = 54;
+ *animation = kModelAnimationSteeleWithGunIdle;
Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatIdle);
}
break;
case 29:
- *animation = 57;
+ *animation = kModelAnimationSteeleWithGunGotHitRight;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
_animationState = 23;
- *animation = 54;
+ *animation = kModelAnimationSteeleWithGunIdle;
Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatIdle);
}
break;
case 30:
- *animation = 58;
+ *animation = kModelAnimationSteeleWithGunGotHitLeft;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
_animationState = 23;
- *animation = 54;
+ *animation = kModelAnimationSteeleWithGunIdle;
Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatIdle);
}
break;
case 31:
- *animation = 71;
+ *animation = kModelAnimationSteeleGotHitRight;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
- *animation = 74;
+ *animation = kModelAnimationSteeleIdle;
_animationFrame = 0;
_animationState = 0;
Actor_Change_Animation_Mode(kActorSteele, kAnimationModeIdle);
@@ -1860,10 +1860,10 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 32:
- *animation = 72;
+ *animation = kModelAnimationSteeleGotHitLeft;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
- *animation = 74;
+ *animation = kModelAnimationSteeleIdle;
_animationFrame = 0;
_animationState = 0;
Actor_Change_Animation_Mode(kActorSteele, kAnimationModeIdle);
@@ -1871,25 +1871,25 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 33:
- *animation = 61;
+ *animation = kModelAnimationSteeleWithGunShotDead;
if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(*animation) - 1)
++_animationFrame;
break;
case 34:
- *animation = 73;
+ *animation = kModelAnimationSteeleShotDead;
if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(*animation) - 1)
++_animationFrame;
break;
case 35:
- *animation = 61;
+ *animation = kModelAnimationSteeleWithGunShotDead;
if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(*animation) - 1)
++_animationFrame;
break;
case 36:
- *animation = 88;
+ *animation = kModelAnimationSteeleWithGunAimingToRightIdle;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
@@ -1904,9 +1904,9 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
_animationState = 0;
_var1 = 3;
_flag = 0;
- *animation = 89;
+ *animation = kModelAnimationSteeleWithGunAimingToRightTalk;
} else {
- *animation = 89;
+ *animation = kModelAnimationSteeleWithGunAimingToRightTalk;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
@@ -1915,32 +1915,32 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 38:
- *animation = 90;
+ *animation = kModelAnimationSteeleWithGunAimingToRightHandHit;
++_animationFrame;
if (_animationFrame > 5) {
Actor_Change_Animation_Mode(kActorSteele, kAnimationModeIdle);
_animationState = 0;
_animationFrame = 0;
- *animation = 74;
+ *animation = kModelAnimationSteeleIdle;
Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR01PrepareTalkAboutShotGun);
}
break;
case 39:
- *animation = 92;
+ *animation = kModelAnimationSteeleWithGunAimingToRightShoot;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
_animationState = 36;
- *animation = 88;
+ *animation = kModelAnimationSteeleWithGunAimingToRightIdle;
}
break;
case 40:
- *animation = 91;
+ *animation = kModelAnimationSteeleWithGunAimingToRightHolster;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
- *animation = 74;
+ *animation = kModelAnimationSteeleIdle;
_animationFrame = 0;
_animationState = 0;
_var1 = 0;
@@ -1950,9 +1950,9 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
case 41:
switch (_var1) {
case 0:
- *animation = 74;
+ *animation = kModelAnimationSteeleIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(74)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationSteeleIdle)) {
_animationFrame = 0;
if (!Game_Flag_Query(kFlagSteeleSmoking)) {
_var1 = 3;
@@ -1963,7 +1963,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 1:
- *animation = 75;
+ *animation = kModelAnimationSteeleTakeCigPuff;
if (_var2 != 0) {
--_var2;
} else {
@@ -1987,7 +1987,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 3:
- *animation = 76;
+ *animation = kModelAnimationSteeleThrowCigAndStepOnIt;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationState = 0;
@@ -2001,6 +2001,8 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
default:
+ // TODO is this an error?
+ // 406 is a Zuben animation
*animation = 406;
_animationFrame = 0;
break;
@@ -2113,7 +2115,7 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
_animationState = 1;
_animationFrame = 0;
_animationStateNext = 14;
- _animationNext = 77;
+ _animationNext = kModelAnimationSteeleATalk;
}
_flag = 0;
}
@@ -2162,7 +2164,7 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
_animationState = 1;
_animationFrame = 0;
_animationStateNext = 15;
- _animationNext = 78;
+ _animationNext = kModelAnimationSteeleBTalk;
}
_flag = 0;
break;
@@ -2175,7 +2177,7 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
_animationState = 1;
_animationFrame = 0;
_animationStateNext = 16;
- _animationNext = 79;
+ _animationNext = kModelAnimationSteeleSmallLeftHandMoveTalk;
}
_flag = 0;
break;
@@ -2188,7 +2190,7 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
_animationState = 1;
_animationFrame = 0;
_animationStateNext = 17;
- _animationNext = 80;
+ _animationNext = kModelAnimationSteeleProtestTalk;
}
_flag = 0;
break;
@@ -2201,7 +2203,7 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
_animationState = 1;
_animationFrame = 0;
_animationStateNext = 18;
- _animationNext = 81;
+ _animationNext = kModelAnimationSteeleDismissTalk;
}
_flag = 0;
break;
@@ -2214,7 +2216,7 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
_animationState = 1;
_animationFrame = 0;
_animationStateNext = 19;
- _animationNext = 81;
+ _animationNext = kModelAnimationSteeleDismissTalk;
}
_flag = 0;
break;
More information about the Scummvm-git-logs
mailing list