[Scummvm-git-logs] scummvm master -> 34aa57674410425cc84898c197f745c310505acf
antoniou79
a.antoniou79 at gmail.com
Sun Dec 6 15:00:04 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:
34aa576744 BLADERUNNER: Add descriptive names for some animations
Commit: 34aa57674410425cc84898c197f745c310505acf
https://github.com/scummvm/scummvm/commit/34aa57674410425cc84898c197f745c310505acf
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2020-12-06T16:52:47+02:00
Commit Message:
BLADERUNNER: Add descriptive names for some animations
Maggie and rats
Changed paths:
engines/bladerunner/game_constants.h
engines/bladerunner/script/ai/free_slot_a.cpp
engines/bladerunner/script/ai/free_slot_b.cpp
engines/bladerunner/script/ai/generic_walker_a.cpp
engines/bladerunner/script/ai/generic_walker_b.cpp
engines/bladerunner/script/ai/generic_walker_c.cpp
engines/bladerunner/script/ai/maggie.cpp
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 9bc4643990..ebba2f0ff7 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -1286,8 +1286,8 @@ enum AnimationModes {
// 27 - 28 not used
// 29 stand up
// 30 - 37 not used
- // 38 ???
- // 39 not used
+ // 38 McCoy searches inside big dumpster
+ // 39 McCoy agonizing death animation - not used
// 40 McCoy throws body
kAnimationModeSpinnerGetIn = 41,
kAnimationModeSpinnerGetOut = 42,
@@ -1301,7 +1301,7 @@ enum AnimationModes {
// 50 Luther, Tyrell Guard ???
// 51 Steele, Maggie ???
kAnimationModeFeeding = 52,
- kAnimationModeSit = 53, // more like sitting than sitting down
+ kAnimationModeSit = 53, // sitting (eg. for McCoy used in NR04, NR05 rotating couch) (McCoy, Clovis, Dektora, Guzza, Gordo)
// 54 Clovis, Maggie ???
// 55 transient, Tyrell Guard, Maggie
// 56 Maggie ???
@@ -1314,14 +1314,14 @@ enum AnimationModes {
kAnimationModeClimbDown = 65,
kAnimationModeCombatClimbUp = 66,
kAnimationModeCombatClimbDown = 67
- // 68 McCoy getting kicked
+ // 68 McCoy getting kicked (while down)
// 69 not used
// 70 Dektora ???
// 71 Dektora ???
// 72 Desk Clerk, Leon ???
// 73 EarlyQ ???
// 74 EarlyQ ???
- // 75 McCoy drinking ???
+ // 75 McCoy drinking
// 76 EarlyQ ???
// 77 not used
// 78 Hanoi ???
@@ -1864,7 +1864,27 @@ enum GameModelAnimations {
// 838 - 845: Mama Isabella animations
// 846 - 856: Leon animations
// 857 - 862: Rat (Free Slot A/B) animations
+ kModelAnimationRatJumpAttack = 857,
+ kModelAnimationRatRunning = 858,
+ kModelAnimationRatDying = 859,
+ kModelAnimationRatHurt = 860,
+ kModelAnimationRatIdle = 861,
+ kModelAnimationRatSlowWalk = 862,
// 863 - 876: Maggie animations
+ kModelAnimationMaggieWalking = 863,
+ kModelAnimationMaggieStandingIdle = 864,
+ kModelAnimationMaggieBarking = 865,
+ kModelAnimationMaggieLayingDown = 866,
+ kModelAnimationMaggieLayingIdleTailWagging = 867,
+ kModelAnimationMaggieLayingStandingUp = 868,
+ kModelAnimationMaggieStandingOnTwoFeet = 869,
+ kModelAnimationMaggieBarkingOrHeadUp = 870,
+ kModelAnimationMaggieLayingDead = 871,
+ kModelAnimationMaggieWalkingTrapped = 872,
+ kModelAnimationMaggieStandingOnTwoFeetTrapped = 873,
+ kModelAnimationMaggieExploding = 874,
+ kModelAnimationMaggieStandingIdleTrapped = 875,
+ kModelAnimationMaggieToggleLaySleepingWakeUp = 876,
// 877 - 884: Hysteria Patron1 (dancer) animations
kModelAnimationHysteriaPatron1DanceStandingUpSemiSitAndUp = 877,
kModelAnimationHysteriaPatron1DanceStandingUpLeftMotion = 878,
diff --git a/engines/bladerunner/script/ai/free_slot_a.cpp b/engines/bladerunner/script/ai/free_slot_a.cpp
index 330e50b01a..968b0620c1 100644
--- a/engines/bladerunner/script/ai/free_slot_a.cpp
+++ b/engines/bladerunner/script/ai/free_slot_a.cpp
@@ -400,15 +400,15 @@ bool AIScriptFreeSlotA::GoalChanged(int currentGoalNumber, int newGoalNumber) {
bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
switch (_animationState) {
case 0:
- *animation = 861;
+ *animation = kModelAnimationRatIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(861)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatIdle)) {
_animationFrame = 0;
}
break;
case 1:
- *animation = 862;
+ *animation = kModelAnimationRatSlowWalk;
if (_var1) {
--_var1;
} else {
@@ -429,25 +429,25 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
break;
case 2:
- *animation = 862;
+ *animation = kModelAnimationRatSlowWalk;
++_animationFrame;
- if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(862) - 1) {
- *animation = 861;
+ if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatSlowWalk) - 1) {
+ *animation = kModelAnimationRatIdle;
_animationFrame = 0;
_animationState = 0;
}
break;
case 3:
- *animation = 858;
+ *animation = kModelAnimationRatRunning;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(858)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatRunning)) {
_animationFrame = 0;
}
break;
case 4:
- *animation = 857;
+ *animation = kModelAnimationRatJumpAttack;
++_animationFrame;
if (_animationFrame == 1) {
int snd;
@@ -462,7 +462,7 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
Ambient_Sounds_Play_Sound(kSfxRATTY4, 99, 0, 0, 20);
Actor_Combat_AI_Hit_Attempt(kActorFreeSlotA);
}
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(857)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatJumpAttack)) {
_animationState = 0;
_animationFrame = 0;
Actor_Change_Animation_Mode(kActorFreeSlotA, kAnimationModeCombatIdle);
@@ -472,9 +472,9 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
case 5:
// This is an animation for Maggie (exploding) but is also used for generic death states (rats, generic walkers)
// probably for debug purposes
- *animation = 874;
+ *animation = kModelAnimationMaggieExploding;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(874) - 1) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieExploding) - 1) {
Actor_Change_Animation_Mode(kActorFreeSlotA, kAnimationModeIdle);
}
break;
@@ -483,9 +483,9 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
if (_animationFrame == 1) {
Ambient_Sounds_Play_Sound(kSfxRATTY3, 99, 0, 0, 20);
}
- *animation = 860;
+ *animation = kModelAnimationRatHurt;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(860)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatHurt)) {
_animationFrame = 0;
_animationState = 0;
Actor_Change_Animation_Mode(kActorFreeSlotA, kAnimationModeIdle);
@@ -493,22 +493,22 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
break;
case 7:
- *animation = 859;
+ *animation = kModelAnimationRatDying;
++_animationFrame;
if (_animationFrame == 1) {
Ambient_Sounds_Play_Sound(kSfxRATTY5, 99, 0, 0, 25);
}
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(859) - 1) {
- // -1 in the clause is ok here since the next _animationState is 8 which will maintain the last frame (Slice_Animation_Query_Number_Of_Frames(859) - 1)
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(859) - 1;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatDying) - 1) {
+ // -1 in the clause is ok here since the next _animationState is 8 which will maintain the last frame (Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatDying) - 1)
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatDying) - 1;
_animationState = 8;
Actor_Set_Goal_Number(kActorFreeSlotA, kGoalFreeSlotAGone);
}
break;
case 8:
- *animation = 859;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(859) - 1;
+ *animation = kModelAnimationRatDying;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatDying) - 1;
break;
default:
break;
diff --git a/engines/bladerunner/script/ai/free_slot_b.cpp b/engines/bladerunner/script/ai/free_slot_b.cpp
index 74ec73f530..3093bc32ae 100644
--- a/engines/bladerunner/script/ai/free_slot_b.cpp
+++ b/engines/bladerunner/script/ai/free_slot_b.cpp
@@ -264,15 +264,15 @@ bool AIScriptFreeSlotB::GoalChanged(int currentGoalNumber, int newGoalNumber) {
bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
switch (_animationState) {
case 0:
- *animation = 861;
+ *animation = kModelAnimationRatIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(861)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatIdle)) {
_animationFrame = 0;
}
break;
case 1:
- *animation = 862;
+ *animation = kModelAnimationRatSlowWalk;
if (_var1) {
--_var1;
} else {
@@ -293,25 +293,25 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
break;
case 2:
- *animation = 862;
+ *animation = kModelAnimationRatSlowWalk;
++_animationFrame;
- if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(862) - 1) {
- *animation = 861;
+ if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatSlowWalk) - 1) {
+ *animation = kModelAnimationRatIdle;
_animationFrame = 0;
_animationState = 0;
}
break;
case 3:
- *animation = 858;
+ *animation = kModelAnimationRatRunning;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(858)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatRunning)) {
_animationFrame = 0;
}
break;
case 4:
- *animation = 857;
+ *animation = kModelAnimationRatJumpAttack;
++_animationFrame;
if (_animationFrame == 3) {
int snd;
@@ -326,7 +326,7 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
Actor_Combat_AI_Hit_Attempt(kActorFreeSlotB);
}
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
- *animation = 861;
+ *animation = kModelAnimationRatIdle;
_animationFrame = 0;
_animationState = 0;
}
@@ -335,11 +335,11 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
case 5:
// This is an animation for Maggie (exploding) but is also used for generic death states (rats, generic walkers)
// probably for debug purposes
- *animation = 874;
+ *animation = kModelAnimationMaggieExploding;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(874) - 1) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieExploding) - 1) {
_animationState = 8;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(874) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieExploding) - 1;
}
break;
@@ -347,9 +347,9 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
if (_animationFrame == 1) {
Ambient_Sounds_Play_Sound(kSfxRATTY3, 99, 0, 0, 20);
}
- *animation = 860;
+ *animation = kModelAnimationRatHurt;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(860)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatHurt)) {
_animationFrame = 0;
_animationState = 0;
Actor_Change_Animation_Mode(kActorFreeSlotB, kAnimationModeIdle);
@@ -357,27 +357,27 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
break;
case 7:
- *animation = 859;
+ *animation = kModelAnimationRatDying;
++_animationFrame;
if (_animationFrame == 1) {
Ambient_Sounds_Play_Sound(kSfxRATTY5, 99, 0, 0, 25);
}
#if BLADERUNNER_ORIGINAL_BUGS
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(859) - 1) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(859) - 1;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatDying) - 1) {
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatDying) - 1;
}
_animationState = 8;
#else
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(859) - 1) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(859) - 1;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatDying) - 1) {
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatDying) - 1;
_animationState = 8;
}
#endif // BLADERUNNER_ORIGINAL_BUGS
break;
case 8:
- *animation = 859;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(859) - 1;
+ *animation = kModelAnimationRatDying;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationRatDying) - 1;
break;
default:
diff --git a/engines/bladerunner/script/ai/generic_walker_a.cpp b/engines/bladerunner/script/ai/generic_walker_a.cpp
index 0e11f4f98b..a80bdf5062 100644
--- a/engines/bladerunner/script/ai/generic_walker_a.cpp
+++ b/engines/bladerunner/script/ai/generic_walker_a.cpp
@@ -308,9 +308,9 @@ bool AIScriptGenericWalkerA::UpdateAnimation(int *animation, int *frame) {
case kGenericWalkerAStatesDie:
// This is an animation for Maggie (exploding) but is also used for generic death states (rats, generic walkers)
// probably for debug purposes
- *animation = 874;
+ *animation = kModelAnimationMaggieExploding;
++_animationFrame;
- if (++_animationFrame >= Slice_Animation_Query_Number_Of_Frames(874))
+ if (++_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieExploding))
{
_animationFrame = 0;
Actor_Set_Goal_Number(kActorGenwalkerA, kGoalGenwalkerDefault);
diff --git a/engines/bladerunner/script/ai/generic_walker_b.cpp b/engines/bladerunner/script/ai/generic_walker_b.cpp
index 49856bae49..3f64d01168 100644
--- a/engines/bladerunner/script/ai/generic_walker_b.cpp
+++ b/engines/bladerunner/script/ai/generic_walker_b.cpp
@@ -272,9 +272,9 @@ bool AIScriptGenericWalkerB::UpdateAnimation(int *animation, int *frame) {
case kGenericWalkerBStatesDie:
// This is an animation for Maggie (exploding) but is also used for generic death states (rats, generic walkers)
// probably for debug purposes
- *animation = 874;
+ *animation = kModelAnimationMaggieExploding;
++_animationFrame;
- if (++_animationFrame >= Slice_Animation_Query_Number_Of_Frames(874))
+ if (++_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieExploding))
{
_animationFrame = 0;
Actor_Set_Goal_Number(kActorGenwalkerB, kGoalGenwalkerDefault);
diff --git a/engines/bladerunner/script/ai/generic_walker_c.cpp b/engines/bladerunner/script/ai/generic_walker_c.cpp
index 68e14017f7..754088b715 100644
--- a/engines/bladerunner/script/ai/generic_walker_c.cpp
+++ b/engines/bladerunner/script/ai/generic_walker_c.cpp
@@ -26,8 +26,7 @@ namespace BladeRunner {
enum kGenericWalkerCStates {
kGenericWalkerCStatesIdle = 0,
kGenericWalkerCStatesWalk = 1,
- kGenericWalkerCStatesDie = 2,
- kGenericWalkerCStatesGun = 3
+ kGenericWalkerCStatesDie = 2
};
AIScriptGenericWalkerC::AIScriptGenericWalkerC(BladeRunnerEngine *vm) : AIScriptBase(vm) {
@@ -273,9 +272,9 @@ bool AIScriptGenericWalkerC::UpdateAnimation(int *animation, int *frame) {
case kGenericWalkerCStatesDie:
// This is an animation for Maggie (exploding) but is also used for generic death states (rats, generic walkers)
// probably for debug purposes
- *animation = 874;
+ *animation = kModelAnimationMaggieExploding;
++_animationFrame;
- if (++_animationFrame >= Slice_Animation_Query_Number_Of_Frames(874))
+ if (++_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieExploding))
{
_animationFrame = 0;
Actor_Set_Goal_Number(kActorGenwalkerC, kGoalGenwalkerDefault);
diff --git a/engines/bladerunner/script/ai/maggie.cpp b/engines/bladerunner/script/ai/maggie.cpp
index 74f0ebbf0c..cc087de9bf 100644
--- a/engines/bladerunner/script/ai/maggie.cpp
+++ b/engines/bladerunner/script/ai/maggie.cpp
@@ -319,6 +319,9 @@ bool AIScriptMaggie::GoalChanged(int currentGoalNumber, int newGoalNumber) {
case kGoalMaggieMA02SitDown:
Actor_Change_Animation_Mode(kActorMaggie, 54);
+ // TODO Why set _animationState and frame explicitly here,
+ // when the Actor_Change_Animation_Mode() should take care of it?
+ // does this not negate the "transition" animation?
_animationState = kMaggieStateLayingIdle;
_animationFrame = 0;
AI_Countdown_Timer_Reset(kActorMaggie, kActorTimerAIScriptCustomTask0);
@@ -327,6 +330,9 @@ bool AIScriptMaggie::GoalChanged(int currentGoalNumber, int newGoalNumber) {
case kGoalMaggieMA02Sleep:
Actor_Change_Animation_Mode(kActorMaggie, 55);
+ // TODO Why set _animationState and frame explicitly here,
+ // when the Actor_Change_Animation_Mode() should take care of it?
+ // does this not negate the "transition" animation?
_animationState = kMaggieStateSleeping;
_animationFrame = 0;
return true;
@@ -398,19 +404,19 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
int goal;
switch (_animationState) {
case kMaggieStateDead:
- *animation = 871;
+ *animation = kModelAnimationMaggieLayingDead;
_animationFrame = 0;
break;
case kMaggieStateDeadExploded:
- *animation = 874;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(874) - 1;
+ *animation = kModelAnimationMaggieExploding;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieExploding) - 1;
break;
case kMaggieStateExploding:
- *animation = 874;
+ *animation = kModelAnimationMaggieExploding;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(874) - 1) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieExploding) - 1) {
_animationState = kMaggieStateDeadExploded;
_animationFrame = Slice_Animation_Query_Number_Of_Frames(*animation) - 1;
Actor_Put_In_Set(kActorMaggie, kSetFreeSlotI);
@@ -419,46 +425,46 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
break;
case kMaggieStateBombJumping:
- *animation = 873;
+ *animation = kModelAnimationMaggieStandingOnTwoFeetTrapped;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(873)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieStandingOnTwoFeetTrapped)) {
_animationState = kMaggieStateBombIdle;
_animationFrame = 0;
- *animation = 875;
+ *animation = kModelAnimationMaggieStandingIdleTrapped;
Actor_Set_Goal_Number(kActorMaggie, kGoalMaggieKP05WillExplode);
}
break;
case kMaggieStateBombWalk:
- *animation = 872;
+ *animation = kModelAnimationMaggieWalkingTrapped;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(872)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieWalkingTrapped)) {
_animationFrame = 0;
}
break;
case kMaggieStateBombIdle:
- *animation = 875;
+ *animation = kModelAnimationMaggieStandingIdleTrapped;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(875)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieStandingIdleTrapped)) {
_animationFrame = 0;
}
break;
case kMaggieStateWakingUp:
- *animation = 876;
+ *animation = kModelAnimationMaggieToggleLaySleepingWakeUp;
--_animationFrame;
if (_animationFrame > 0) {
break;
}
_animationState = kMaggieStateLayingIdle;
_animationFrame = 0;
- *animation = 867;
+ *animation = kModelAnimationMaggieLayingIdleTailWagging;
goal = Actor_Query_Goal_Number(kActorMaggie);
if (goal == kGoalMaggieMA02GetFed) {
_animationState = kMaggieStateStandingUp;
_animationFrame = 0;
- *animation = 868;
+ *animation = kModelAnimationMaggieLayingStandingUp;
} else if (goal == kGoalMaggieMA02WalkToMcCoy) {
Actor_Set_Goal_Number(kActorMaggie, kGoalMaggieMA02SitDown);
Actor_Set_Goal_Number(kActorMaggie, kGoalMaggieMA02WalkToMcCoy);
@@ -468,24 +474,24 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
break;
case kMaggieStateSleeping:
- *animation = 876;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(876) - 1;
+ *animation = kModelAnimationMaggieToggleLaySleepingWakeUp;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieToggleLaySleepingWakeUp) - 1;
break;
case kMaggieStateGoingToSleep:
- *animation = 876;
+ *animation = kModelAnimationMaggieToggleLaySleepingWakeUp;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(876) - 1) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieToggleLaySleepingWakeUp) - 1) {
_animationState = kMaggieStateSleeping;
Actor_Set_Goal_Number(kActorMaggie, kGoalMaggieMA02Sleep);
}
break;
case kMaggieStateStandingUp:
- *animation = 868;
+ *animation = kModelAnimationMaggieLayingStandingUp;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(868)) {
- *animation = 864;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieLayingStandingUp)) {
+ *animation = kModelAnimationMaggieStandingIdle;
_animationState = kMaggieStateIdle;
_animationFrame = 0;
if (Actor_Query_Goal_Number(kActorMaggie) == kGoalMaggieMA02SitDown) {
@@ -498,20 +504,20 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
break;
case kMaggieStateLayingIdle:
- *animation = 867;
+ *animation = kModelAnimationMaggieLayingIdleTailWagging;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(867)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieLayingIdleTailWagging)) {
_animationFrame = 0;
}
break;
case kMaggieStateLayingDown:
- *animation = 866;
+ *animation = kModelAnimationMaggieLayingDown;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(866)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieLayingDown)) {
_animationState = kMaggieStateLayingIdle;
_animationFrame = 0;
- *animation = 867;
+ *animation = kModelAnimationMaggieLayingIdleTailWagging;
if (Actor_Query_Goal_Number(kActorMaggie) == 9) {
Actor_Set_Goal_Number(kActorMaggie, kGoalMaggieMA02SitDown);
}
@@ -519,20 +525,20 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
break;
case kMaggieStateHappyB:
- *animation = 865;
+ *animation = kModelAnimationMaggieBarking;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(865)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieBarking)) {
_animationFrame = 0;
--var_45F3F8;
if (var_45F3F8 <= 0) {
Actor_Change_Animation_Mode(kActorMaggie, kAnimationModeIdle);
- *animation = 864;
+ *animation = kModelAnimationMaggieStandingIdle;
}
}
break;
case kMaggieStateHappyA:
- *animation = 870;
+ *animation = kModelAnimationMaggieBarkingOrHeadUp;
if (_animationFrame == 1) {
// one of kSfxDOGBARK1, kSfxDOGBARK3
Sound_Play(Random_Query(kSfxDOGBARK1, kSfxDOGBARK3), 50, 0, 0, 50);
@@ -542,7 +548,7 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
--var_45F3FC;
if (var_45F3FC <= 0) {
Actor_Change_Animation_Mode(kActorMaggie, kAnimationModeIdle);
- *animation = 864;
+ *animation = kModelAnimationMaggieStandingIdle;
_animationState = kMaggieStateIdle;
}
_animationFrame = 0;
@@ -550,28 +556,28 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
break;
case kMaggieStateJumping:
- *animation = 869;
+ *animation = kModelAnimationMaggieStandingOnTwoFeet;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(869)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieStandingOnTwoFeet)) {
Actor_Change_Animation_Mode(kActorMaggie, kAnimationModeIdle);
- *animation = 864;
+ *animation = kModelAnimationMaggieStandingIdle;
_animationState = kMaggieStateIdle;
_animationFrame = 0;
}
break;
case kMaggieStateWalking:
- *animation = 863;
+ *animation = kModelAnimationMaggieWalking;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(863)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieWalking)) {
_animationFrame = 0;
}
break;
case kMaggieStateIdle:
- *animation = 864;
+ *animation = kModelAnimationMaggieStandingIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(864)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMaggieStandingIdle)) {
_animationFrame = 0;
}
break;
@@ -641,7 +647,7 @@ bool AIScriptMaggie::ChangeAnimationMode(int mode) {
case 54:
if (_animationState <= kMaggieStateSleeping) {
- if (_animationState > 0) {
+ if (_animationState > kMaggieStateIdle) {
if (_animationState == kMaggieStateSleeping) {
_animationState = kMaggieStateWakingUp;
_animationFrame = 0;
@@ -661,7 +667,7 @@ bool AIScriptMaggie::ChangeAnimationMode(int mode) {
break;
case 56:
- if (_animationState != 3) {
+ if (_animationState != kMaggieStateHappyA) {
_animationFrame = 0;
_animationState = kMaggieStateHappyA;
}
More information about the Scummvm-git-logs
mailing list