[Scummvm-git-logs] scummvm master -> 8bebd58730e641eea8b528b63d813332d00c502f
antoniou79
a.antoniou79 at gmail.com
Wed Dec 9 14:08:06 UTC 2020
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
350bf23a47 BLADERUNNER: Describe and check Clovis animations
8bebd58730 BLADERUNNER: Describe and check Guzza animations
Commit: 350bf23a47b744617fa0ab3e7bc3f63f3a3cbf38
https://github.com/scummvm/scummvm/commit/350bf23a47b744617fa0ab3e7bc3f63f3a3cbf38
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2020-12-09T16:06:47+02:00
Commit Message:
BLADERUNNER: Describe and check Clovis animations
Changed paths:
engines/bladerunner/game_constants.h
engines/bladerunner/script/ai/clovis.cpp
engines/bladerunner/script/ai/steele.cpp
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index fdfeaecff7..039e9dd564 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -1748,8 +1748,8 @@ enum GameModelAnimations {
kModelAnimationMcCoyDrinkingBooze = 53,
// 54 - 92: Steele animations
kModelAnimationSteeleWithGunIdle = 54,
- kModelAnimationSteeleWithGunHopASideways = 55, // ??? untriggered
- kModelAnimationSteeleWithGunHopBSideways = 56, // ??? untriggered
+ kModelAnimationSteeleWithGunStrafeFast = 55, // ??? untriggered
+ kModelAnimationSteeleWithGunStrafeSlow = 56, // ??? untriggered
kModelAnimationSteeleWithGunGotHitRight = 57,
kModelAnimationSteeleWithGunGotHitLeft = 58,
kModelAnimationSteeleWithGunWalking = 59,
@@ -1788,8 +1788,8 @@ enum GameModelAnimations {
kModelAnimationSteeleWithGunAimingToRightShoot = 92, // Shooting at Gordo
// 93 - 133: Gordo animations
kModelAnimationGordoWithGunIdle = 93,
- kModelAnimationGordoHopASideways = 94, // UNUSED
- kModelAnimationGordoHopBSideways = 95, // UNUSED
+ kModelAnimationGordoStrafeFast = 94, // UNUSED
+ kModelAnimationGordoStrafeSlow = 95, // UNUSED
kModelAnimationGordoWithGunGotHitRight = 96,
kModelAnimationGordoWithGunGotHitLeft = 97,
kModelAnimationGordoWithGunWalking = 98,
@@ -1868,7 +1868,88 @@ enum GameModelAnimations {
kModelAnimationDektoraDancingC = 170,
kModelAnimationDektoraDancingFinale = 171,
// 172 - 207: Guzza animations
+ kModelAnimationGuzzaWithGunIdle = 172,
+ kModelAnimationGuzzaWithGunGotHitRight = 173,
+ kModelAnimationGuzzaWithGunGotHitLeft = 174,
+ kModelAnimationGuzzaWithGunGotHitStraight = 175,
+ kModelAnimationGuzzaWithGunWalking = 176,
+ kModelAnimationGuzzaWithGunRunning = 177,
+ kModelAnimationGuzzaWithGunShotDeadCollapsesInPlace = 178, // UNUSED?
+ kModelAnimationGuzzaWithGunSuggestTalk = 179,
+ kModelAnimationGuzzaWithGunDismissTalk = 180,
+ kModelAnimationGuzzaWithGunBackwardTalk = 181,
+ kModelAnimationGuzzaWithGunUnholsterGun = 182,
+ kModelAnimationGuzzaWithGunHolsterGun = 183,
+ kModelAnimationGuzzaWithGunShooting = 184,
+ kModelAnimationGuzzaWalking = 185,
+ kModelAnimationGuzzaRunning = 186,
+ kModelAnimationGuzzaClimbStairsUp = 187,
+ kModelAnimationGuzzaClimbStairsDown = 188,
+ kModelAnimationGuzzaSitAndTalk = 189,
+ kModelAnimationGuzzaSitAndEat = 190,
+ kModelAnimationGuzzaSitAndLookAtFood = 191,
+ kModelAnimationGuzzaSitAndSmallHandMoveTalk = 192,
+ kModelAnimationGuzzaSitAndSmallBothHandsMoveTalk = 193,
+ kModelAnimationGuzzaSitAndLargerHandMoveTalk = 194,
+ kModelAnimationGuzzaSitAndUpsetHandMoveTalk = 195,
+ kModelAnimationGuzzaSitAndDismissHandMoveTalk = 196,
+ kModelAnimationGuzzaStandIdle = 197,
+ kModelAnimationGuzzaStandAndWipeNose = 198,
+ kModelAnimationGuzzaStandAndScratchBelly = 199,
+ kModelAnimationGuzzaStandAndGiveOrPutHigh = 200,
+ kModelAnimationGuzzaStandAndSuggestTalk = 201,
+ kModelAnimationGuzzaStandAndExplainOneHandMoveTalk = 202,
+ kModelAnimationGuzzaStandAndExplainBothHandsMoveTalk = 203,
+ kModelAnimationGuzzaStandAndGiveOrThrowWaistLevel = 204,
+ kModelAnimationGuzzaStandAndDismissiveOneHandMoveTalk = 205,
+ kModelAnimationGuzzaStandAndDismissiveBothHandsMoveTalk = 206,
+ kModelAnimationGuzzaWithGunShotFallBackwards = 207,
// 208 - 252: Clovis animations
+ kModelAnimationGlovisCombatIdle = 208,
+ kModelAnimationGlovisCombatStrafeSlow = 209, // Untriggered
+ kModelAnimationGlovisCombatStrafeFast = 210, // Untriggered
+ kModelAnimationGlovisCombatGotHitRight = 211,
+ kModelAnimationGlovisCombatGotHitLeft = 212,
+ kModelAnimationGlovisCombatWalking = 213, // Untriggered
+ kModelAnimationGlovisCombatRunning = 214, // UNUSED
+ kModelAnimationGlovisCombatClimbStairsUp = 215, // Untriggered
+ kModelAnimationGlovisCombatClimbStairsDown = 216, // Untriggered
+ kModelAnimationGlovisCombatAssumePosition = 217,
+ kModelAnimationGlovisCombatResumeNonCombat = 218,
+ kModelAnimationGlovisCombatPunchAttack = 219,
+ kModelAnimationGlovisWalking = 220,
+ kModelAnimationGlovisRunning = 221,
+ kModelAnimationGlovisClimbStairsUp = 222, // Untriggered
+ kModelAnimationGlovisClimbStairsDown = 223, // Untrigered
+ kModelAnimationGlovisGotHitRight = 224,
+ kModelAnimationGlovisGotHitLeft = 225,
+ kModelAnimationGlovisShotDead = 226,
+ kModelAnimationGlovisIdle = 227,
+ kModelAnimationGlovisLookingUpAndAbout = 228,
+ kModelAnimationGlovisOscillatingFeet = 229, // UNUSED
+ kModelAnimationGlovisCalmTalk = 230,
+ kModelAnimationGlovisSuggestingTalk = 231,
+ kModelAnimationGlovisSuggestingAndBeardScratchTalk = 232,
+ kModelAnimationGlovisAffirmingTalk = 233,
+ kModelAnimationGlovisHandCircularMoveTalk = 234,
+ kModelAnimationGlovisPointingTalk = 235,
+ kModelAnimationGlovisNegotiatingTalk = 236,
+ kModelAnimationGlovisGiveAndTakeOrPointingToSelf = 237, // UNUSED (Talking too?)
+ kModelAnimationGlovisKneelingChecking = 238,
+ kModelAnimationGlovisStandingToKneeling = 239,
+ kModelAnimationGlovisKneelingToStanding = 240,
+ kModelAnimationGlovisKneelingTalking = 241,
+ kModelAnimationGlovisJumpingDodging = 242, // animation mode 20 (TODO: Where is this used in game? In the Moonbus massacre scenario?)
+ kModelAnimationGlovisLayingWithBookIdle = 243, //
+ kModelAnimationGlovisLayingWithBookStopsReadingTalk = 244,
+ kModelAnimationGlovisLayingWithBookStillReadingTalk = 245,
+ kModelAnimationGlovisLayingWithBookGotHitOrSmallCough = 246, // UNUSED
+ kModelAnimationGlovisLayingWithBookReadingOutLoud = 247, // Untriggered - ends in kModelAnimationGlovisLayingWithBookStopsReadingTalk
+ kModelAnimationGlovisLayingWithBookGotHitOrViolentCough = 248, // Untriggered - ends in kModelAnimationGlovisLayingWithBookDyingDropBook
+ kModelAnimationGlovisLayingWithBookDyingDropBook = 249, // Untriggered?!
+ kModelAnimationGlovisLayingWithBookUnholsterGun = 250, // Untriggered - ends in kModelAnimationGlovisLayingWithBookPointingGun
+ kModelAnimationGlovisLayingWithBookPointingGun = 251, // maybe also firing? // linked with untriggered kModelAnimationGlovisLayingWithBookUnholsterGun
+ kModelAnimationGlovisLayingWithBookDyingDropGun = 252, // This is the one used for Clovis laying down death (A bug?)
// 253 - 276: Lucy animations
// 277 - 311: Izo animations
// 312 - 345: Sadik animations
diff --git a/engines/bladerunner/script/ai/clovis.cpp b/engines/bladerunner/script/ai/clovis.cpp
index d7ec2a8f01..6d5b7f0db9 100644
--- a/engines/bladerunner/script/ai/clovis.cpp
+++ b/engines/bladerunner/script/ai/clovis.cpp
@@ -568,19 +568,19 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
switch (_animationState) {
case 0:
if (_var1 == 1) {
- *animation = 227;
+ *animation = kModelAnimationGlovisIdle;
if (_var2) {
--_var2;
} else if (++_animationFrame == 7) {
_var2 = Random_Query(5, 15);
} else {
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(227)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisIdle)) {
_animationFrame = 0;
_var1 = 0;
}
}
} else if (_var1 == 0) {
- *animation = 228;
+ *animation = kModelAnimationGlovisLookingUpAndAbout;
if (_var2) {
_animationFrame += _var3;
if (_animationFrame > _var5) {
@@ -610,11 +610,11 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
}
}
}
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(228)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLookingUpAndAbout)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(228) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLookingUpAndAbout) - 1;
}
}
if (!_animationFrame) {
@@ -635,10 +635,10 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
case 1:
if (_var1 == 0) {
- *animation = 228;
+ *animation = kModelAnimationGlovisLookingUpAndAbout;
}
if (_var1 == 1) {
- *animation = 227;
+ *animation = kModelAnimationGlovisIdle;
}
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
_animationFrame += 3;
@@ -658,26 +658,26 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
break;
case 2:
- *animation = 238;
+ *animation = kModelAnimationGlovisKneelingChecking;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(238)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisKneelingChecking)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(238) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisKneelingChecking) - 1;
}
}
break;
case 3:
- *animation = 239;
+ *animation = kModelAnimationGlovisStandingToKneeling;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(239)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisStandingToKneeling)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(239) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisStandingToKneeling) - 1;
flag = true;
} else {
flag = false;
@@ -686,7 +686,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
if (flag) {
_animationState = 2;
_animationFrame = 0;
- *animation = 238;
+ *animation = kModelAnimationGlovisKneelingChecking;
if (Actor_Query_Goal_Number(kActorClovis) == kGoalClovisBB11TalkWithSadik) {
Actor_Set_Goal_Number(kActorClovis, kGoalClovisBB11PrepareTalkToMcCoy);
}
@@ -694,166 +694,166 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
break;
case 4:
- *animation = 240;
+ *animation = kModelAnimationGlovisKneelingToStanding;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(240)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisKneelingToStanding)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(240) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisKneelingToStanding) - 1;
flag = true;
} else {
flag = false;
}
}
if (flag) {
- *animation = 227;
+ *animation = kModelAnimationGlovisIdle;
_animationState = 0;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeIdle);
}
break;
case 5:
- *animation = 230;
+ *animation = kModelAnimationGlovisCalmTalk;
if (!_animationFrame && _flag) {
_animationState = 0;
} else {
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(230)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCalmTalk)) {
_animationFrame = 0;
}
}
break;
case 6:
- *animation = 231;
+ *animation = kModelAnimationGlovisSuggestingTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(231)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisSuggestingTalk)) {
_animationFrame = 0;
_animationState = 5;
- *animation = 230;
+ *animation = kModelAnimationGlovisCalmTalk;
}
break;
case 7:
- *animation = 232;
+ *animation = kModelAnimationGlovisSuggestingAndBeardScratchTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(232)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisSuggestingAndBeardScratchTalk)) {
_animationFrame = 0;
_animationState = 5;
- *animation = 230;
+ *animation = kModelAnimationGlovisCalmTalk;
}
break;
case 8:
- *animation = 233;
+ *animation = kModelAnimationGlovisAffirmingTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(233)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisAffirmingTalk)) {
_animationFrame = 0;
_animationState = 5;
- *animation = 230;
+ *animation = kModelAnimationGlovisCalmTalk;
}
break;
case 9:
- *animation = 234;
+ *animation = kModelAnimationGlovisHandCircularMoveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(234)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisHandCircularMoveTalk)) {
_animationFrame = 0;
_animationState = 5;
- *animation = 230;
+ *animation = kModelAnimationGlovisCalmTalk;
}
break;
case 10:
- *animation = 235;
+ *animation = kModelAnimationGlovisPointingTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(235)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisPointingTalk)) {
_animationFrame = 0;
_animationState = 5;
- *animation = 230;
+ *animation = kModelAnimationGlovisCalmTalk;
}
break;
case 11:
- *animation = 236;
+ *animation = kModelAnimationGlovisNegotiatingTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(236)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisNegotiatingTalk)) {
_animationFrame = 0;
_animationState = 5;
- *animation = 230;
+ *animation = kModelAnimationGlovisCalmTalk;
}
break;
case 12:
- *animation = 241;
+ *animation = kModelAnimationGlovisKneelingTalking;
if (!_animationFrame && _flag) {
_animationState = 2;
_animationFrame = 0;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeSit);
} else {
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(241)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisKneelingTalking)) {
_animationFrame = 0;
}
}
break;
case 13:
- *animation = 208;
+ *animation = kModelAnimationGlovisCombatIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(208)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatIdle)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(208) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatIdle) - 1;
}
}
break;
case 14:
- *animation = 217;
+ *animation = kModelAnimationGlovisCombatAssumePosition;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(217)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatAssumePosition)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(217) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatAssumePosition) - 1;
flag = true;
} else {
flag = false;
}
}
if (flag) {
- *animation = 208;
+ *animation = kModelAnimationGlovisCombatIdle;
_animationState = 13;
}
break;
case 15:
- *animation = 218;
+ *animation = kModelAnimationGlovisCombatResumeNonCombat;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(218)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatResumeNonCombat)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(218) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatResumeNonCombat) - 1;
flag = true;
} else {
flag = false;
}
}
if (flag) {
- *animation = 227;
+ *animation = kModelAnimationGlovisIdle;
_animationState = 0;
}
break;
case 16:
- *animation = 219;
+ *animation = kModelAnimationGlovisCombatPunchAttack;
++_animationFrame;
if (_animationFrame == 2) {
int snd;
@@ -881,20 +881,20 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
}
if (flag) {
_animationState = 13;
- *animation = 208;
+ *animation = kModelAnimationGlovisCombatIdle;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
}
break;
case 17:
- *animation = 211;
+ *animation = kModelAnimationGlovisCombatGotHitRight;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(211)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatGotHitRight)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(211) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatGotHitRight) - 1;
flag = true;
} else {
flag = false;
@@ -902,20 +902,20 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
}
if (flag) {
_animationState = 13;
- *animation = 208;
+ *animation = kModelAnimationGlovisCombatIdle;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
}
break;
case 18:
- *animation = 212;
+ *animation = kModelAnimationGlovisCombatGotHitLeft;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(212)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatGotHitLeft)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(212) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatGotHitLeft) - 1;
flag = true;
} else {
flag = false;
@@ -923,158 +923,158 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
}
if (flag) {
_animationState = 13;
- *animation = 208;
+ *animation = kModelAnimationGlovisCombatIdle;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
}
break;
case 19:
- *animation = 224;
+ *animation = kModelAnimationGlovisGotHitRight;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(224)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisGotHitRight)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(224) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisGotHitRight) - 1;
flag = true;
} else {
flag = false;
}
}
if (flag) {
- *animation = 227;
+ *animation = kModelAnimationGlovisIdle;
_animationState = 0;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeIdle);
}
break;
case 20:
- *animation = 225;
+ *animation = kModelAnimationGlovisGotHitLeft;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(225)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisGotHitLeft)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(225) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisGotHitLeft) - 1;
flag = true;
} else {
flag = false;
}
}
if (flag) {
- *animation = 227;
+ *animation = kModelAnimationGlovisIdle;
_animationState = 0;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeIdle);
}
break;
case 21:
- *animation = 220;
+ *animation = kModelAnimationGlovisWalking;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(220)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisWalking)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(220) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisWalking) - 1;
}
}
break;
case 22:
- *animation = 221;
+ *animation = kModelAnimationGlovisRunning;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(221)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisRunning)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(221) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisRunning) - 1;
}
}
break;
case 23:
- *animation = 213;
+ *animation = kModelAnimationGlovisCombatWalking;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(213)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatWalking)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(213) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatWalking) - 1;
}
}
break;
case 24:
- *animation = 217;
+ *animation = kModelAnimationGlovisCombatAssumePosition;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(217)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatAssumePosition)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(217) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatAssumePosition) - 1;
}
}
break;
case 25:
- *animation = 222;
+ *animation = kModelAnimationGlovisClimbStairsUp;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(222)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisClimbStairsUp)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(222) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisClimbStairsUp) - 1;
}
}
break;
case 26:
- *animation = 223;
+ *animation = kModelAnimationGlovisClimbStairsDown;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(223)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisClimbStairsDown)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(223) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisClimbStairsDown) - 1;
}
}
break;
case 27:
- *animation = 215;
+ *animation = kModelAnimationGlovisCombatClimbStairsUp;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(215)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatClimbStairsUp)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(215) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatClimbStairsUp) - 1;
}
}
break;
case 28:
- *animation = 216;
+ *animation = kModelAnimationGlovisCombatClimbStairsDown;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(216)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatClimbStairsDown)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(216) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatClimbStairsDown) - 1;
}
}
break;
case 29:
- *animation = 209;
+ *animation = kModelAnimationGlovisCombatStrafeSlow;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(209)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatStrafeSlow)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(209) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatStrafeSlow) - 1;
flag = true;
} else {
flag = false;
@@ -1082,20 +1082,20 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
}
if (flag) {
_animationState = 13;
- *animation = 208;
+ *animation = kModelAnimationGlovisCombatIdle;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
}
break;
case 30:
- *animation = 210;
+ *animation = kModelAnimationGlovisCombatStrafeFast;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(210)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatStrafeFast)) {
flag = 1;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(210) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatStrafeFast) - 1;
flag = 1;
} else {
flag = 0;
@@ -1103,46 +1103,46 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
}
if (flag) {
_animationState = 13;
- *animation = 208;
+ *animation = kModelAnimationGlovisCombatIdle;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
}
break;
case 31:
- *animation = 242;
+ *animation = kModelAnimationGlovisJumpingDodging;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(242)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisJumpingDodging)) {
flag = 1;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(242) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisJumpingDodging) - 1;
flag = 1;
} else {
flag = 0;
}
}
if (flag) {
- *animation = 227;
+ *animation = kModelAnimationGlovisIdle;
_animationState = 0;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeIdle);
}
break;
case 32:
- *animation = 243;
+ *animation = kModelAnimationGlovisLayingWithBookIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(243)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookIdle)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(243) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookIdle) - 1;
}
}
break;
case 33:
- *animation = 244;
+ *animation = kModelAnimationGlovisLayingWithBookStopsReadingTalk;
if (_animationFrame == 0
&& _flag
) {
@@ -1151,97 +1151,97 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
Actor_Change_Animation_Mode(kActorClovis, 54);
} else {
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(244)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookStopsReadingTalk)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(244) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookStopsReadingTalk) - 1;
}
}
}
break;
case 34:
- *animation = 245;
+ *animation = kModelAnimationGlovisLayingWithBookStillReadingTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(245)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookStillReadingTalk)) {
_animationState = 33;
_animationFrame = 0;
- *animation = 244;
+ *animation = kModelAnimationGlovisLayingWithBookStopsReadingTalk;
Actor_Change_Animation_Mode(kActorClovis, 54);
}
break;
case 35:
++_animationFrame;
- *animation = 247;
+ *animation = kModelAnimationGlovisLayingWithBookReadingOutLoud;
Actor_Change_Animation_Mode(kActorClovis, 54);
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(247)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookReadingOutLoud)) {
_animationFrame = 0;
_animationState = 33;
- *animation = 244;
+ *animation = kModelAnimationGlovisLayingWithBookStopsReadingTalk;
}
break;
case 36:
- *animation = 248;
+ *animation = kModelAnimationGlovisLayingWithBookGotHitOrViolentCough;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(248)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookGotHitOrViolentCough)) {
_animationFrame = 0;
_animationState = 37;
- *animation = 249;
+ *animation = kModelAnimationGlovisLayingWithBookDyingDropBook;
}
break;
case 37:
- *animation = 249;
- if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(249) - 1) {
+ *animation = kModelAnimationGlovisLayingWithBookDyingDropBook;
+ if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookDyingDropBook) - 1) {
++_animationFrame;
}
break;
case 38:
- *animation = 250;
+ *animation = kModelAnimationGlovisLayingWithBookUnholsterGun;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(250)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookUnholsterGun)) {
_animationFrame = 0;
_animationState = 39;
- *animation = 251;
+ *animation = kModelAnimationGlovisLayingWithBookPointingGun;
}
break;
case 39:
- *animation = 251;
+ *animation = kModelAnimationGlovisLayingWithBookPointingGun;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(251)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookPointingGun)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(251) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookPointingGun) - 1;
}
}
break;
case 40:
- *animation = 252;
- if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(252) - 1) {
+ *animation = kModelAnimationGlovisLayingWithBookDyingDropGun;
+ if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookDyingDropGun) - 1) {
++_animationFrame;
}
break;
case 41:
- *animation = 226;
+ *animation = kModelAnimationGlovisShotDead;
++_animationFrame;
- if (_animationFrame == Slice_Animation_Query_Number_Of_Frames(226) - 1) {
+ if (_animationFrame == Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisShotDead) - 1) {
Actor_Change_Animation_Mode(kActorClovis, 88);
_animationState = 42;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(226) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisShotDead) - 1;
}
break;
case 42:
- *animation = 226;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(226) - 1;
+ *animation = kModelAnimationGlovisShotDead;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisShotDead) - 1;
break;
default:
@@ -1310,7 +1310,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
if (_animationState < 5 || _animationState > 11) {
_animationState = 1;
_animationStateNext = 5;
- _animationNext = 230;
+ _animationNext = kModelAnimationGlovisCalmTalk;
_flag = 0;
}
}
@@ -1331,7 +1331,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
default:
_animationState = 1;
_animationStateNext = 14;
- _animationNext = 217;
+ _animationNext = kModelAnimationGlovisCombatAssumePosition;
break;
}
break;
@@ -1356,7 +1356,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
if (_animationState < 5 || _animationState > 11) {
_animationState = 1;
_animationStateNext = 6;
- _animationNext = 231;
+ _animationNext = kModelAnimationGlovisSuggestingTalk;
_flag = 0;
}
break;
@@ -1366,7 +1366,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
if (_animationState < 5 || _animationState > 11) {
_animationState = 1;
_animationStateNext = 8;
- _animationNext = 233;
+ _animationNext = kModelAnimationGlovisAffirmingTalk;
_flag = 0;
}
break;
@@ -1375,7 +1375,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
if (_animationState < 5 || _animationState > 11) {
_animationState = 1;
_animationStateNext = 7;
- _animationNext = 232;
+ _animationNext = kModelAnimationGlovisSuggestingAndBeardScratchTalk;
_flag = 0;
}
break;
@@ -1384,7 +1384,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
if (_animationState < 5 || _animationState > 11) {
_animationState = 1;
_animationStateNext = 9;
- _animationNext = 234;
+ _animationNext = kModelAnimationGlovisHandCircularMoveTalk;
_flag = 0;
}
break;
@@ -1393,7 +1393,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
if (_animationState < 5 || _animationState > 11) {
_animationState = 1;
_animationStateNext = 10;
- _animationNext = 235;
+ _animationNext = kModelAnimationGlovisPointingTalk;
_flag = 0;
}
break;
@@ -1402,7 +1402,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
if (_animationState < 5 || _animationState > 11) {
_animationState = 1;
_animationStateNext = 11;
- _animationNext = 236;
+ _animationNext = kModelAnimationGlovisNegotiatingTalk;
_flag = 0;
}
break;
@@ -1457,7 +1457,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
case 88:
_animationState = 42;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(226) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisShotDead) - 1;
break;
case kAnimationModeDie:
diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp
index 395c1e88d6..ae03406372 100644
--- a/engines/bladerunner/script/ai/steele.cpp
+++ b/engines/bladerunner/script/ai/steele.cpp
@@ -1805,7 +1805,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 27:
- *animation = kModelAnimationSteeleWithGunHopASideways;
+ *animation = kModelAnimationSteeleWithGunStrafeFast;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
@@ -1816,7 +1816,7 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 28:
- *animation = kModelAnimationSteeleWithGunHopBSideways;
+ *animation = kModelAnimationSteeleWithGunStrafeSlow;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
_animationFrame = 0;
Commit: 8bebd58730e641eea8b528b63d813332d00c502f
https://github.com/scummvm/scummvm/commit/8bebd58730e641eea8b528b63d813332d00c502f
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2020-12-09T16:06:47+02:00
Commit Message:
BLADERUNNER: Describe and check Guzza animations
Also fix typo in Clovis' animation naming
Changed paths:
engines/bladerunner/game_constants.h
engines/bladerunner/script/ai/clovis.cpp
engines/bladerunner/script/ai/guzza.cpp
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 039e9dd564..a4ad30996d 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -1869,15 +1869,15 @@ enum GameModelAnimations {
kModelAnimationDektoraDancingFinale = 171,
// 172 - 207: Guzza animations
kModelAnimationGuzzaWithGunIdle = 172,
- kModelAnimationGuzzaWithGunGotHitRight = 173,
+ kModelAnimationGuzzaWithGunGotHitRight = 173, // Untriggered
kModelAnimationGuzzaWithGunGotHitLeft = 174,
kModelAnimationGuzzaWithGunGotHitStraight = 175,
kModelAnimationGuzzaWithGunWalking = 176,
kModelAnimationGuzzaWithGunRunning = 177,
- kModelAnimationGuzzaWithGunShotDeadCollapsesInPlace = 178, // UNUSED?
+ kModelAnimationGuzzaWithGunShotDeadCollapsesInPlace = 178, // UNUSED
kModelAnimationGuzzaWithGunSuggestTalk = 179,
kModelAnimationGuzzaWithGunDismissTalk = 180,
- kModelAnimationGuzzaWithGunBackwardTalk = 181,
+ kModelAnimationGuzzaWithGunBackwardTalk = 181, // Untriggered
kModelAnimationGuzzaWithGunUnholsterGun = 182,
kModelAnimationGuzzaWithGunHolsterGun = 183,
kModelAnimationGuzzaWithGunShooting = 184,
@@ -1885,7 +1885,7 @@ enum GameModelAnimations {
kModelAnimationGuzzaRunning = 186,
kModelAnimationGuzzaClimbStairsUp = 187,
kModelAnimationGuzzaClimbStairsDown = 188,
- kModelAnimationGuzzaSitAndTalk = 189,
+ kModelAnimationGuzzaSitAndTalkOrChew = 189,
kModelAnimationGuzzaSitAndEat = 190,
kModelAnimationGuzzaSitAndLookAtFood = 191,
kModelAnimationGuzzaSitAndSmallHandMoveTalk = 192,
@@ -1896,7 +1896,7 @@ enum GameModelAnimations {
kModelAnimationGuzzaStandIdle = 197,
kModelAnimationGuzzaStandAndWipeNose = 198,
kModelAnimationGuzzaStandAndScratchBelly = 199,
- kModelAnimationGuzzaStandAndGiveOrPutHigh = 200,
+ kModelAnimationGuzzaStandAndGiveOrPutHigh = 200, // animationMode 23. Is this ever used?
kModelAnimationGuzzaStandAndSuggestTalk = 201,
kModelAnimationGuzzaStandAndExplainOneHandMoveTalk = 202,
kModelAnimationGuzzaStandAndExplainBothHandsMoveTalk = 203,
@@ -1905,51 +1905,51 @@ enum GameModelAnimations {
kModelAnimationGuzzaStandAndDismissiveBothHandsMoveTalk = 206,
kModelAnimationGuzzaWithGunShotFallBackwards = 207,
// 208 - 252: Clovis animations
- kModelAnimationGlovisCombatIdle = 208,
- kModelAnimationGlovisCombatStrafeSlow = 209, // Untriggered
- kModelAnimationGlovisCombatStrafeFast = 210, // Untriggered
- kModelAnimationGlovisCombatGotHitRight = 211,
- kModelAnimationGlovisCombatGotHitLeft = 212,
- kModelAnimationGlovisCombatWalking = 213, // Untriggered
- kModelAnimationGlovisCombatRunning = 214, // UNUSED
- kModelAnimationGlovisCombatClimbStairsUp = 215, // Untriggered
- kModelAnimationGlovisCombatClimbStairsDown = 216, // Untriggered
- kModelAnimationGlovisCombatAssumePosition = 217,
- kModelAnimationGlovisCombatResumeNonCombat = 218,
- kModelAnimationGlovisCombatPunchAttack = 219,
- kModelAnimationGlovisWalking = 220,
- kModelAnimationGlovisRunning = 221,
- kModelAnimationGlovisClimbStairsUp = 222, // Untriggered
- kModelAnimationGlovisClimbStairsDown = 223, // Untrigered
- kModelAnimationGlovisGotHitRight = 224,
- kModelAnimationGlovisGotHitLeft = 225,
- kModelAnimationGlovisShotDead = 226,
- kModelAnimationGlovisIdle = 227,
- kModelAnimationGlovisLookingUpAndAbout = 228,
- kModelAnimationGlovisOscillatingFeet = 229, // UNUSED
- kModelAnimationGlovisCalmTalk = 230,
- kModelAnimationGlovisSuggestingTalk = 231,
- kModelAnimationGlovisSuggestingAndBeardScratchTalk = 232,
- kModelAnimationGlovisAffirmingTalk = 233,
- kModelAnimationGlovisHandCircularMoveTalk = 234,
- kModelAnimationGlovisPointingTalk = 235,
- kModelAnimationGlovisNegotiatingTalk = 236,
- kModelAnimationGlovisGiveAndTakeOrPointingToSelf = 237, // UNUSED (Talking too?)
- kModelAnimationGlovisKneelingChecking = 238,
- kModelAnimationGlovisStandingToKneeling = 239,
- kModelAnimationGlovisKneelingToStanding = 240,
- kModelAnimationGlovisKneelingTalking = 241,
- kModelAnimationGlovisJumpingDodging = 242, // animation mode 20 (TODO: Where is this used in game? In the Moonbus massacre scenario?)
- kModelAnimationGlovisLayingWithBookIdle = 243, //
- kModelAnimationGlovisLayingWithBookStopsReadingTalk = 244,
- kModelAnimationGlovisLayingWithBookStillReadingTalk = 245,
- kModelAnimationGlovisLayingWithBookGotHitOrSmallCough = 246, // UNUSED
- kModelAnimationGlovisLayingWithBookReadingOutLoud = 247, // Untriggered - ends in kModelAnimationGlovisLayingWithBookStopsReadingTalk
- kModelAnimationGlovisLayingWithBookGotHitOrViolentCough = 248, // Untriggered - ends in kModelAnimationGlovisLayingWithBookDyingDropBook
- kModelAnimationGlovisLayingWithBookDyingDropBook = 249, // Untriggered?!
- kModelAnimationGlovisLayingWithBookUnholsterGun = 250, // Untriggered - ends in kModelAnimationGlovisLayingWithBookPointingGun
- kModelAnimationGlovisLayingWithBookPointingGun = 251, // maybe also firing? // linked with untriggered kModelAnimationGlovisLayingWithBookUnholsterGun
- kModelAnimationGlovisLayingWithBookDyingDropGun = 252, // This is the one used for Clovis laying down death (A bug?)
+ kModelAnimationClovisCombatIdle = 208,
+ kModelAnimationClovisCombatStrafeSlow = 209, // Untriggered
+ kModelAnimationClovisCombatStrafeFast = 210, // Untriggered
+ kModelAnimationClovisCombatGotHitRight = 211,
+ kModelAnimationClovisCombatGotHitLeft = 212,
+ kModelAnimationClovisCombatWalking = 213, // Untriggered
+ kModelAnimationClovisCombatRunning = 214, // UNUSED
+ kModelAnimationClovisCombatClimbStairsUp = 215, // Untriggered
+ kModelAnimationClovisCombatClimbStairsDown = 216, // Untriggered
+ kModelAnimationClovisCombatAssumePosition = 217,
+ kModelAnimationClovisCombatResumeNonCombat = 218,
+ kModelAnimationClovisCombatPunchAttack = 219,
+ kModelAnimationClovisWalking = 220,
+ kModelAnimationClovisRunning = 221,
+ kModelAnimationClovisClimbStairsUp = 222, // Untriggered
+ kModelAnimationClovisClimbStairsDown = 223, // Untrigered
+ kModelAnimationClovisGotHitRight = 224,
+ kModelAnimationClovisGotHitLeft = 225,
+ kModelAnimationClovisShotDead = 226,
+ kModelAnimationClovisIdle = 227,
+ kModelAnimationClovisLookingUpAndAbout = 228,
+ kModelAnimationClovisOscillatingFeet = 229, // UNUSED
+ kModelAnimationClovisCalmTalk = 230,
+ kModelAnimationClovisSuggestingTalk = 231,
+ kModelAnimationClovisSuggestingAndBeardScratchTalk = 232,
+ kModelAnimationClovisAffirmingTalk = 233,
+ kModelAnimationClovisHandCircularMoveTalk = 234,
+ kModelAnimationClovisPointingTalk = 235,
+ kModelAnimationClovisNegotiatingTalk = 236,
+ kModelAnimationClovisGiveAndTakeOrPointingToSelf = 237, // UNUSED (Talking too?)
+ kModelAnimationClovisKneelingChecking = 238,
+ kModelAnimationClovisStandingToKneeling = 239,
+ kModelAnimationClovisKneelingToStanding = 240,
+ kModelAnimationClovisKneelingTalking = 241,
+ kModelAnimationClovisJumpingDodging = 242, // animation mode 20 (TODO: Where is this used in game? In the Moonbus massacre scenario?)
+ kModelAnimationClovisLayingWithBookIdle = 243, //
+ kModelAnimationClovisLayingWithBookStopsReadingTalk = 244,
+ kModelAnimationClovisLayingWithBookStillReadingTalk = 245,
+ kModelAnimationClovisLayingWithBookGotHitOrSmallCough = 246, // UNUSED
+ kModelAnimationClovisLayingWithBookReadingOutLoud = 247, // Untriggered - ends in kModelAnimationClovisLayingWithBookStopsReadingTalk
+ kModelAnimationClovisLayingWithBookGotHitOrViolentCough = 248, // Untriggered - ends in kModelAnimationClovisLayingWithBookDyingDropBook
+ kModelAnimationClovisLayingWithBookDyingDropBook = 249, // Untriggered?!
+ kModelAnimationClovisLayingWithBookUnholsterGun = 250, // Untriggered - ends in kModelAnimationClovisLayingWithBookPointingGun
+ kModelAnimationClovisLayingWithBookPointingGun = 251, // maybe also firing? // linked with untriggered kModelAnimationClovisLayingWithBookUnholsterGun
+ kModelAnimationClovisLayingWithBookDyingDropGun = 252, // This is the one used for Clovis laying down death (A bug?)
// 253 - 276: Lucy animations
// 277 - 311: Izo animations
// 312 - 345: Sadik animations
diff --git a/engines/bladerunner/script/ai/clovis.cpp b/engines/bladerunner/script/ai/clovis.cpp
index 6d5b7f0db9..8fe2964984 100644
--- a/engines/bladerunner/script/ai/clovis.cpp
+++ b/engines/bladerunner/script/ai/clovis.cpp
@@ -568,19 +568,19 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
switch (_animationState) {
case 0:
if (_var1 == 1) {
- *animation = kModelAnimationGlovisIdle;
+ *animation = kModelAnimationClovisIdle;
if (_var2) {
--_var2;
} else if (++_animationFrame == 7) {
_var2 = Random_Query(5, 15);
} else {
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisIdle)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisIdle)) {
_animationFrame = 0;
_var1 = 0;
}
}
} else if (_var1 == 0) {
- *animation = kModelAnimationGlovisLookingUpAndAbout;
+ *animation = kModelAnimationClovisLookingUpAndAbout;
if (_var2) {
_animationFrame += _var3;
if (_animationFrame > _var5) {
@@ -610,11 +610,11 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
}
}
}
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLookingUpAndAbout)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLookingUpAndAbout)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLookingUpAndAbout) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLookingUpAndAbout) - 1;
}
}
if (!_animationFrame) {
@@ -635,10 +635,10 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
case 1:
if (_var1 == 0) {
- *animation = kModelAnimationGlovisLookingUpAndAbout;
+ *animation = kModelAnimationClovisLookingUpAndAbout;
}
if (_var1 == 1) {
- *animation = kModelAnimationGlovisIdle;
+ *animation = kModelAnimationClovisIdle;
}
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
_animationFrame += 3;
@@ -658,26 +658,26 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
break;
case 2:
- *animation = kModelAnimationGlovisKneelingChecking;
+ *animation = kModelAnimationClovisKneelingChecking;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisKneelingChecking)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisKneelingChecking)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisKneelingChecking) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisKneelingChecking) - 1;
}
}
break;
case 3:
- *animation = kModelAnimationGlovisStandingToKneeling;
+ *animation = kModelAnimationClovisStandingToKneeling;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisStandingToKneeling)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisStandingToKneeling)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisStandingToKneeling) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisStandingToKneeling) - 1;
flag = true;
} else {
flag = false;
@@ -686,7 +686,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
if (flag) {
_animationState = 2;
_animationFrame = 0;
- *animation = kModelAnimationGlovisKneelingChecking;
+ *animation = kModelAnimationClovisKneelingChecking;
if (Actor_Query_Goal_Number(kActorClovis) == kGoalClovisBB11TalkWithSadik) {
Actor_Set_Goal_Number(kActorClovis, kGoalClovisBB11PrepareTalkToMcCoy);
}
@@ -694,166 +694,166 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
break;
case 4:
- *animation = kModelAnimationGlovisKneelingToStanding;
+ *animation = kModelAnimationClovisKneelingToStanding;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisKneelingToStanding)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisKneelingToStanding)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisKneelingToStanding) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisKneelingToStanding) - 1;
flag = true;
} else {
flag = false;
}
}
if (flag) {
- *animation = kModelAnimationGlovisIdle;
+ *animation = kModelAnimationClovisIdle;
_animationState = 0;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeIdle);
}
break;
case 5:
- *animation = kModelAnimationGlovisCalmTalk;
+ *animation = kModelAnimationClovisCalmTalk;
if (!_animationFrame && _flag) {
_animationState = 0;
} else {
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCalmTalk)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCalmTalk)) {
_animationFrame = 0;
}
}
break;
case 6:
- *animation = kModelAnimationGlovisSuggestingTalk;
+ *animation = kModelAnimationClovisSuggestingTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisSuggestingTalk)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisSuggestingTalk)) {
_animationFrame = 0;
_animationState = 5;
- *animation = kModelAnimationGlovisCalmTalk;
+ *animation = kModelAnimationClovisCalmTalk;
}
break;
case 7:
- *animation = kModelAnimationGlovisSuggestingAndBeardScratchTalk;
+ *animation = kModelAnimationClovisSuggestingAndBeardScratchTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisSuggestingAndBeardScratchTalk)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisSuggestingAndBeardScratchTalk)) {
_animationFrame = 0;
_animationState = 5;
- *animation = kModelAnimationGlovisCalmTalk;
+ *animation = kModelAnimationClovisCalmTalk;
}
break;
case 8:
- *animation = kModelAnimationGlovisAffirmingTalk;
+ *animation = kModelAnimationClovisAffirmingTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisAffirmingTalk)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisAffirmingTalk)) {
_animationFrame = 0;
_animationState = 5;
- *animation = kModelAnimationGlovisCalmTalk;
+ *animation = kModelAnimationClovisCalmTalk;
}
break;
case 9:
- *animation = kModelAnimationGlovisHandCircularMoveTalk;
+ *animation = kModelAnimationClovisHandCircularMoveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisHandCircularMoveTalk)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisHandCircularMoveTalk)) {
_animationFrame = 0;
_animationState = 5;
- *animation = kModelAnimationGlovisCalmTalk;
+ *animation = kModelAnimationClovisCalmTalk;
}
break;
case 10:
- *animation = kModelAnimationGlovisPointingTalk;
+ *animation = kModelAnimationClovisPointingTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisPointingTalk)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisPointingTalk)) {
_animationFrame = 0;
_animationState = 5;
- *animation = kModelAnimationGlovisCalmTalk;
+ *animation = kModelAnimationClovisCalmTalk;
}
break;
case 11:
- *animation = kModelAnimationGlovisNegotiatingTalk;
+ *animation = kModelAnimationClovisNegotiatingTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisNegotiatingTalk)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisNegotiatingTalk)) {
_animationFrame = 0;
_animationState = 5;
- *animation = kModelAnimationGlovisCalmTalk;
+ *animation = kModelAnimationClovisCalmTalk;
}
break;
case 12:
- *animation = kModelAnimationGlovisKneelingTalking;
+ *animation = kModelAnimationClovisKneelingTalking;
if (!_animationFrame && _flag) {
_animationState = 2;
_animationFrame = 0;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeSit);
} else {
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisKneelingTalking)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisKneelingTalking)) {
_animationFrame = 0;
}
}
break;
case 13:
- *animation = kModelAnimationGlovisCombatIdle;
+ *animation = kModelAnimationClovisCombatIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatIdle)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatIdle)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatIdle) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatIdle) - 1;
}
}
break;
case 14:
- *animation = kModelAnimationGlovisCombatAssumePosition;
+ *animation = kModelAnimationClovisCombatAssumePosition;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatAssumePosition)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatAssumePosition)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatAssumePosition) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatAssumePosition) - 1;
flag = true;
} else {
flag = false;
}
}
if (flag) {
- *animation = kModelAnimationGlovisCombatIdle;
+ *animation = kModelAnimationClovisCombatIdle;
_animationState = 13;
}
break;
case 15:
- *animation = kModelAnimationGlovisCombatResumeNonCombat;
+ *animation = kModelAnimationClovisCombatResumeNonCombat;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatResumeNonCombat)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatResumeNonCombat)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatResumeNonCombat) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatResumeNonCombat) - 1;
flag = true;
} else {
flag = false;
}
}
if (flag) {
- *animation = kModelAnimationGlovisIdle;
+ *animation = kModelAnimationClovisIdle;
_animationState = 0;
}
break;
case 16:
- *animation = kModelAnimationGlovisCombatPunchAttack;
+ *animation = kModelAnimationClovisCombatPunchAttack;
++_animationFrame;
if (_animationFrame == 2) {
int snd;
@@ -881,20 +881,20 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
}
if (flag) {
_animationState = 13;
- *animation = kModelAnimationGlovisCombatIdle;
+ *animation = kModelAnimationClovisCombatIdle;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
}
break;
case 17:
- *animation = kModelAnimationGlovisCombatGotHitRight;
+ *animation = kModelAnimationClovisCombatGotHitRight;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatGotHitRight)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatGotHitRight)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatGotHitRight) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatGotHitRight) - 1;
flag = true;
} else {
flag = false;
@@ -902,20 +902,20 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
}
if (flag) {
_animationState = 13;
- *animation = kModelAnimationGlovisCombatIdle;
+ *animation = kModelAnimationClovisCombatIdle;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
}
break;
case 18:
- *animation = kModelAnimationGlovisCombatGotHitLeft;
+ *animation = kModelAnimationClovisCombatGotHitLeft;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatGotHitLeft)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatGotHitLeft)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatGotHitLeft) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatGotHitLeft) - 1;
flag = true;
} else {
flag = false;
@@ -923,158 +923,158 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
}
if (flag) {
_animationState = 13;
- *animation = kModelAnimationGlovisCombatIdle;
+ *animation = kModelAnimationClovisCombatIdle;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
}
break;
case 19:
- *animation = kModelAnimationGlovisGotHitRight;
+ *animation = kModelAnimationClovisGotHitRight;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisGotHitRight)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisGotHitRight)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisGotHitRight) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisGotHitRight) - 1;
flag = true;
} else {
flag = false;
}
}
if (flag) {
- *animation = kModelAnimationGlovisIdle;
+ *animation = kModelAnimationClovisIdle;
_animationState = 0;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeIdle);
}
break;
case 20:
- *animation = kModelAnimationGlovisGotHitLeft;
+ *animation = kModelAnimationClovisGotHitLeft;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisGotHitLeft)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisGotHitLeft)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisGotHitLeft) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisGotHitLeft) - 1;
flag = true;
} else {
flag = false;
}
}
if (flag) {
- *animation = kModelAnimationGlovisIdle;
+ *animation = kModelAnimationClovisIdle;
_animationState = 0;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeIdle);
}
break;
case 21:
- *animation = kModelAnimationGlovisWalking;
+ *animation = kModelAnimationClovisWalking;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisWalking)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisWalking)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisWalking) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisWalking) - 1;
}
}
break;
case 22:
- *animation = kModelAnimationGlovisRunning;
+ *animation = kModelAnimationClovisRunning;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisRunning)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisRunning)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisRunning) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisRunning) - 1;
}
}
break;
case 23:
- *animation = kModelAnimationGlovisCombatWalking;
+ *animation = kModelAnimationClovisCombatWalking;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatWalking)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatWalking)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatWalking) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatWalking) - 1;
}
}
break;
case 24:
- *animation = kModelAnimationGlovisCombatAssumePosition;
+ *animation = kModelAnimationClovisCombatAssumePosition;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatAssumePosition)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatAssumePosition)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatAssumePosition) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatAssumePosition) - 1;
}
}
break;
case 25:
- *animation = kModelAnimationGlovisClimbStairsUp;
+ *animation = kModelAnimationClovisClimbStairsUp;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisClimbStairsUp)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisClimbStairsUp)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisClimbStairsUp) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisClimbStairsUp) - 1;
}
}
break;
case 26:
- *animation = kModelAnimationGlovisClimbStairsDown;
+ *animation = kModelAnimationClovisClimbStairsDown;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisClimbStairsDown)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisClimbStairsDown)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisClimbStairsDown) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisClimbStairsDown) - 1;
}
}
break;
case 27:
- *animation = kModelAnimationGlovisCombatClimbStairsUp;
+ *animation = kModelAnimationClovisCombatClimbStairsUp;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatClimbStairsUp)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatClimbStairsUp)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatClimbStairsUp) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatClimbStairsUp) - 1;
}
}
break;
case 28:
- *animation = kModelAnimationGlovisCombatClimbStairsDown;
+ *animation = kModelAnimationClovisCombatClimbStairsDown;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatClimbStairsDown)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatClimbStairsDown)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatClimbStairsDown) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatClimbStairsDown) - 1;
}
}
break;
case 29:
- *animation = kModelAnimationGlovisCombatStrafeSlow;
+ *animation = kModelAnimationClovisCombatStrafeSlow;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatStrafeSlow)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatStrafeSlow)) {
flag = true;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatStrafeSlow) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatStrafeSlow) - 1;
flag = true;
} else {
flag = false;
@@ -1082,20 +1082,20 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
}
if (flag) {
_animationState = 13;
- *animation = kModelAnimationGlovisCombatIdle;
+ *animation = kModelAnimationClovisCombatIdle;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
}
break;
case 30:
- *animation = kModelAnimationGlovisCombatStrafeFast;
+ *animation = kModelAnimationClovisCombatStrafeFast;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatStrafeFast)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatStrafeFast)) {
flag = 1;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisCombatStrafeFast) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisCombatStrafeFast) - 1;
flag = 1;
} else {
flag = 0;
@@ -1103,46 +1103,46 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
}
if (flag) {
_animationState = 13;
- *animation = kModelAnimationGlovisCombatIdle;
+ *animation = kModelAnimationClovisCombatIdle;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatIdle);
}
break;
case 31:
- *animation = kModelAnimationGlovisJumpingDodging;
+ *animation = kModelAnimationClovisJumpingDodging;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisJumpingDodging)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisJumpingDodging)) {
flag = 1;
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisJumpingDodging) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisJumpingDodging) - 1;
flag = 1;
} else {
flag = 0;
}
}
if (flag) {
- *animation = kModelAnimationGlovisIdle;
+ *animation = kModelAnimationClovisIdle;
_animationState = 0;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeIdle);
}
break;
case 32:
- *animation = kModelAnimationGlovisLayingWithBookIdle;
+ *animation = kModelAnimationClovisLayingWithBookIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookIdle)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLayingWithBookIdle)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookIdle) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLayingWithBookIdle) - 1;
}
}
break;
case 33:
- *animation = kModelAnimationGlovisLayingWithBookStopsReadingTalk;
+ *animation = kModelAnimationClovisLayingWithBookStopsReadingTalk;
if (_animationFrame == 0
&& _flag
) {
@@ -1151,97 +1151,97 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
Actor_Change_Animation_Mode(kActorClovis, 54);
} else {
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookStopsReadingTalk)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLayingWithBookStopsReadingTalk)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookStopsReadingTalk) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLayingWithBookStopsReadingTalk) - 1;
}
}
}
break;
case 34:
- *animation = kModelAnimationGlovisLayingWithBookStillReadingTalk;
+ *animation = kModelAnimationClovisLayingWithBookStillReadingTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookStillReadingTalk)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLayingWithBookStillReadingTalk)) {
_animationState = 33;
_animationFrame = 0;
- *animation = kModelAnimationGlovisLayingWithBookStopsReadingTalk;
+ *animation = kModelAnimationClovisLayingWithBookStopsReadingTalk;
Actor_Change_Animation_Mode(kActorClovis, 54);
}
break;
case 35:
++_animationFrame;
- *animation = kModelAnimationGlovisLayingWithBookReadingOutLoud;
+ *animation = kModelAnimationClovisLayingWithBookReadingOutLoud;
Actor_Change_Animation_Mode(kActorClovis, 54);
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookReadingOutLoud)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLayingWithBookReadingOutLoud)) {
_animationFrame = 0;
_animationState = 33;
- *animation = kModelAnimationGlovisLayingWithBookStopsReadingTalk;
+ *animation = kModelAnimationClovisLayingWithBookStopsReadingTalk;
}
break;
case 36:
- *animation = kModelAnimationGlovisLayingWithBookGotHitOrViolentCough;
+ *animation = kModelAnimationClovisLayingWithBookGotHitOrViolentCough;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookGotHitOrViolentCough)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLayingWithBookGotHitOrViolentCough)) {
_animationFrame = 0;
_animationState = 37;
- *animation = kModelAnimationGlovisLayingWithBookDyingDropBook;
+ *animation = kModelAnimationClovisLayingWithBookDyingDropBook;
}
break;
case 37:
- *animation = kModelAnimationGlovisLayingWithBookDyingDropBook;
- if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookDyingDropBook) - 1) {
+ *animation = kModelAnimationClovisLayingWithBookDyingDropBook;
+ if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLayingWithBookDyingDropBook) - 1) {
++_animationFrame;
}
break;
case 38:
- *animation = kModelAnimationGlovisLayingWithBookUnholsterGun;
+ *animation = kModelAnimationClovisLayingWithBookUnholsterGun;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookUnholsterGun)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLayingWithBookUnholsterGun)) {
_animationFrame = 0;
_animationState = 39;
- *animation = kModelAnimationGlovisLayingWithBookPointingGun;
+ *animation = kModelAnimationClovisLayingWithBookPointingGun;
}
break;
case 39:
- *animation = kModelAnimationGlovisLayingWithBookPointingGun;
+ *animation = kModelAnimationClovisLayingWithBookPointingGun;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookPointingGun)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLayingWithBookPointingGun)) {
_animationFrame = 0;
} else {
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookPointingGun) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLayingWithBookPointingGun) - 1;
}
}
break;
case 40:
- *animation = kModelAnimationGlovisLayingWithBookDyingDropGun;
- if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisLayingWithBookDyingDropGun) - 1) {
+ *animation = kModelAnimationClovisLayingWithBookDyingDropGun;
+ if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLayingWithBookDyingDropGun) - 1) {
++_animationFrame;
}
break;
case 41:
- *animation = kModelAnimationGlovisShotDead;
+ *animation = kModelAnimationClovisShotDead;
++_animationFrame;
- if (_animationFrame == Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisShotDead) - 1) {
+ if (_animationFrame == Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisShotDead) - 1) {
Actor_Change_Animation_Mode(kActorClovis, 88);
_animationState = 42;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisShotDead) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisShotDead) - 1;
}
break;
case 42:
- *animation = kModelAnimationGlovisShotDead;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisShotDead) - 1;
+ *animation = kModelAnimationClovisShotDead;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisShotDead) - 1;
break;
default:
@@ -1310,7 +1310,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
if (_animationState < 5 || _animationState > 11) {
_animationState = 1;
_animationStateNext = 5;
- _animationNext = kModelAnimationGlovisCalmTalk;
+ _animationNext = kModelAnimationClovisCalmTalk;
_flag = 0;
}
}
@@ -1331,7 +1331,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
default:
_animationState = 1;
_animationStateNext = 14;
- _animationNext = kModelAnimationGlovisCombatAssumePosition;
+ _animationNext = kModelAnimationClovisCombatAssumePosition;
break;
}
break;
@@ -1356,7 +1356,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
if (_animationState < 5 || _animationState > 11) {
_animationState = 1;
_animationStateNext = 6;
- _animationNext = kModelAnimationGlovisSuggestingTalk;
+ _animationNext = kModelAnimationClovisSuggestingTalk;
_flag = 0;
}
break;
@@ -1366,7 +1366,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
if (_animationState < 5 || _animationState > 11) {
_animationState = 1;
_animationStateNext = 8;
- _animationNext = kModelAnimationGlovisAffirmingTalk;
+ _animationNext = kModelAnimationClovisAffirmingTalk;
_flag = 0;
}
break;
@@ -1375,7 +1375,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
if (_animationState < 5 || _animationState > 11) {
_animationState = 1;
_animationStateNext = 7;
- _animationNext = kModelAnimationGlovisSuggestingAndBeardScratchTalk;
+ _animationNext = kModelAnimationClovisSuggestingAndBeardScratchTalk;
_flag = 0;
}
break;
@@ -1384,7 +1384,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
if (_animationState < 5 || _animationState > 11) {
_animationState = 1;
_animationStateNext = 9;
- _animationNext = kModelAnimationGlovisHandCircularMoveTalk;
+ _animationNext = kModelAnimationClovisHandCircularMoveTalk;
_flag = 0;
}
break;
@@ -1393,7 +1393,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
if (_animationState < 5 || _animationState > 11) {
_animationState = 1;
_animationStateNext = 10;
- _animationNext = kModelAnimationGlovisPointingTalk;
+ _animationNext = kModelAnimationClovisPointingTalk;
_flag = 0;
}
break;
@@ -1402,7 +1402,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
if (_animationState < 5 || _animationState > 11) {
_animationState = 1;
_animationStateNext = 11;
- _animationNext = kModelAnimationGlovisNegotiatingTalk;
+ _animationNext = kModelAnimationClovisNegotiatingTalk;
_flag = 0;
}
break;
@@ -1457,7 +1457,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
case 88:
_animationState = 42;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGlovisShotDead) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisShotDead) - 1;
break;
case kAnimationModeDie:
diff --git a/engines/bladerunner/script/ai/guzza.cpp b/engines/bladerunner/script/ai/guzza.cpp
index 4a9566773d..c962721adf 100644
--- a/engines/bladerunner/script/ai/guzza.cpp
+++ b/engines/bladerunner/script/ai/guzza.cpp
@@ -327,9 +327,9 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
case 0:
switch (_state) {
case 0:
- *animation = 197;
+ *animation = kModelAnimationGuzzaStandIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(197)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaStandIdle)) {
_animationFrame = 0;
if (Random_Query(0, 5) == 0) {
_state = Random_Query(1, 2);
@@ -337,19 +337,19 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
}
break;
case 1:
- *animation = 198;
+ *animation = kModelAnimationGuzzaStandAndWipeNose;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(198)) {
- *animation = 197;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaStandAndWipeNose)) {
+ *animation = kModelAnimationGuzzaStandIdle;
_animationFrame = 0;
_state = 0;
}
break;
case 2:
- *animation = 199;
+ *animation = kModelAnimationGuzzaStandAndScratchBelly;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(199)) {
- *animation = 197;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaStandAndScratchBelly)) {
+ *animation = kModelAnimationGuzzaStandIdle;
_animationFrame = 0;
_state = 0;
}
@@ -360,7 +360,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
case 1:
switch (_state) {
case 0:
- *animation = 189;
+ *animation = kModelAnimationGuzzaSitAndTalkOrChew;
if (_counter) {
--_counter;
if (Random_Query(0, 6) == 0) {
@@ -387,24 +387,24 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
}
break;
case 1:
- *animation = 190;
+ *animation = kModelAnimationGuzzaSitAndEat;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(190)) {
- *animation = 189;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaSitAndEat)) {
+ *animation = kModelAnimationGuzzaSitAndTalkOrChew;
_animationFrame = 0;
_state = 0;
}
break;
case 2:
- *animation = 191;
+ *animation = kModelAnimationGuzzaSitAndLookAtFood;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(191)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaSitAndLookAtFood)) {
if (Random_Query(0, 2) == 0) {
- *animation = 189;
+ *animation = kModelAnimationGuzzaSitAndTalkOrChew;
_animationFrame = 0;
_state = 0;
} else {
- *animation = 190;
+ *animation = kModelAnimationGuzzaSitAndEat;
_animationFrame = 0;
_state = 1;
}
@@ -420,9 +420,9 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
_animationState = _animationStateNext;
} else {
if (_state == 1) {
- *animation = 198;
+ *animation = kModelAnimationGuzzaStandAndWipeNose;
} else if (_state == 2) {
- *animation = 199;
+ *animation = kModelAnimationGuzzaStandAndScratchBelly;
}
_animationFrame += 2;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
@@ -436,13 +436,13 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
case 3:
switch (_state) {
case 0:
- *animation = 189;
+ *animation = kModelAnimationGuzzaSitAndTalkOrChew;
break;
case 1:
- *animation = 190;
+ *animation = kModelAnimationGuzzaSitAndEat;
break;
case 2:
- *animation = 191;
+ *animation = kModelAnimationGuzzaSitAndLookAtFood;
break;
}
_animationFrame += 4;
@@ -454,123 +454,123 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
break;
case 4:
- *animation = 185;
+ *animation = kModelAnimationGuzzaWalking;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(185)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWalking)) {
_animationFrame = 0;
}
break;
case 5:
- *animation = 186;
+ *animation = kModelAnimationGuzzaRunning;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(186)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaRunning)) {
_animationFrame = 0;
}
break;
case 6:
- *animation = 176;
+ *animation = kModelAnimationGuzzaWithGunWalking;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(176)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWithGunWalking)) {
_animationFrame = 0;
}
break;
case 7:
- *animation = 177;
+ *animation = kModelAnimationGuzzaWithGunRunning;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(177)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWithGunRunning)) {
_animationFrame = 0;
}
break;
case 8:
- *animation = 181;
+ *animation = kModelAnimationGuzzaWithGunBackwardTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(181)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWithGunBackwardTalk)) {
_animationFrame = 0;
}
break;
case 9:
- *animation = 187;
+ *animation = kModelAnimationGuzzaClimbStairsUp;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(187)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaClimbStairsUp)) {
_animationFrame = 0;
}
break;
case 10:
- *animation = 188;
+ *animation = kModelAnimationGuzzaClimbStairsDown;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(188)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaClimbStairsDown)) {
_animationFrame = 0;
}
break;
case 11:
if (_animationFrame == 0 && _flag) {
- *animation = 197;
+ *animation = kModelAnimationGuzzaStandIdle;
_animationState = 0;
_flag = false;
_state = 0;
_counter = 0;
_frameDelta = 1;
} else {
- *animation = 201;
+ *animation = kModelAnimationGuzzaStandAndSuggestTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(201)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaStandAndSuggestTalk)) {
_animationFrame = 0;
}
}
break;
case 12:
- *animation = 202;
+ *animation = kModelAnimationGuzzaStandAndExplainOneHandMoveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(202)) {
- *animation = 201;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaStandAndExplainOneHandMoveTalk)) {
+ *animation = kModelAnimationGuzzaStandAndSuggestTalk;
_animationFrame = 0;
_animationState = 11;
}
break;
case 13:
- *animation = 203;
+ *animation = kModelAnimationGuzzaStandAndExplainBothHandsMoveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(203)) {
- *animation = 201;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaStandAndExplainBothHandsMoveTalk)) {
+ *animation = kModelAnimationGuzzaStandAndSuggestTalk;
_animationFrame = 0;
_animationState = 11;
}
break;
case 14:
- *animation = 204;
+ *animation = kModelAnimationGuzzaStandAndGiveOrThrowWaistLevel;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(204)) {
- *animation = 201;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaStandAndGiveOrThrowWaistLevel)) {
+ *animation = kModelAnimationGuzzaStandAndSuggestTalk;
_animationFrame = 0;
_animationState = 11;
}
break;
case 15:
- *animation = 205;
+ *animation = kModelAnimationGuzzaStandAndDismissiveOneHandMoveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(205)) {
- *animation = 201;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaStandAndDismissiveOneHandMoveTalk)) {
+ *animation = kModelAnimationGuzzaStandAndSuggestTalk;
_animationFrame = 0;
_animationState = 11;
}
break;
case 16:
- *animation = 206;
+ *animation = kModelAnimationGuzzaStandAndDismissiveBothHandsMoveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(206)) {
- *animation = 201;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaStandAndDismissiveBothHandsMoveTalk)) {
+ *animation = kModelAnimationGuzzaStandAndSuggestTalk;
_animationFrame = 0;
_animationState = 11;
}
@@ -578,7 +578,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
case 17:
if (_animationFrame == 0 && _flag) {
- *animation = 189;
+ *animation = kModelAnimationGuzzaSitAndTalkOrChew;
_animationState = 1;
_flag = false;
Actor_Change_Animation_Mode(kActorGuzza, 53);
@@ -586,49 +586,49 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
_counter = 0;
_frameDelta = 1;
} else {
- *animation = 192;
+ *animation = kModelAnimationGuzzaSitAndSmallHandMoveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(192)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaSitAndSmallHandMoveTalk)) {
_animationFrame = 0;
}
}
break;
case 18:
- *animation = 193;
+ *animation = kModelAnimationGuzzaSitAndSmallBothHandsMoveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(193)) {
- *animation = 192;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaSitAndSmallBothHandsMoveTalk)) {
+ *animation = kModelAnimationGuzzaSitAndSmallHandMoveTalk;
_animationFrame = 0;
_animationState = 17;
}
break;
case 19:
- *animation = 194;
+ *animation = kModelAnimationGuzzaSitAndLargerHandMoveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(194)) {
- *animation = 192;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaSitAndLargerHandMoveTalk)) {
+ *animation = kModelAnimationGuzzaSitAndSmallHandMoveTalk;
_animationState = 17;
_animationFrame = 0;
}
break;
case 20:
- *animation = 195;
+ *animation = kModelAnimationGuzzaSitAndUpsetHandMoveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(195)) {
- *animation = 192;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaSitAndUpsetHandMoveTalk)) {
+ *animation = kModelAnimationGuzzaSitAndSmallHandMoveTalk;
_animationFrame = 0;
_animationState = 17;
}
break;
case 21:
- *animation = 196;
+ *animation = kModelAnimationGuzzaSitAndDismissHandMoveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(196)) {
- *animation = 192;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaSitAndDismissHandMoveTalk)) {
+ *animation = kModelAnimationGuzzaSitAndSmallHandMoveTalk;
_animationFrame = 0;
_animationState = 17;
}
@@ -636,7 +636,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
case 22:
if (_animationFrame == 0 && _flag) {
- *animation = 172;
+ *animation = kModelAnimationGuzzaWithGunIdle;
_animationState = 24;
_flag = false;
Actor_Change_Animation_Mode(kActorGuzza, kAnimationModeCombatIdle);
@@ -644,9 +644,9 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
_counter = 0;
_frameDelta = 1;
} else {
- *animation = 179;
+ *animation = kModelAnimationGuzzaWithGunSuggestTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(179)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWithGunSuggestTalk)) {
_animationFrame = 0;
}
}
@@ -654,7 +654,7 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
case 23:
if (_animationFrame == 0 && _flag) {
- *animation = 172;
+ *animation = kModelAnimationGuzzaWithGunIdle;
_animationState = 24;
_flag = false;
Actor_Change_Animation_Mode(kActorGuzza, kAnimationModeCombatIdle);
@@ -662,34 +662,34 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
_counter = 0;
_frameDelta = 1;
} else {
- *animation = 180;
+ *animation = kModelAnimationGuzzaWithGunDismissTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(180)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWithGunDismissTalk)) {
_animationFrame = 0;
}
}
break;
case 24:
- *animation = 172;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(172)) {
+ *animation = kModelAnimationGuzzaWithGunIdle;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWithGunIdle)) {
_animationFrame = 0;
}
break;
case 25:
- *animation = 173;
+ *animation = kModelAnimationGuzzaWithGunGotHitRight;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(173)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWithGunGotHitRight)) {
_animationFrame = 0;
}
break;
case 26:
- *animation = 174;
+ *animation = kModelAnimationGuzzaWithGunGotHitLeft;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(174)) {
- *animation = 172;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWithGunGotHitLeft)) {
+ *animation = kModelAnimationGuzzaWithGunIdle;
_animationFrame = 0;
_animationState = 24;
Actor_Change_Animation_Mode(kActorGuzza, kAnimationModeCombatIdle);
@@ -697,10 +697,10 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
break;
case 27:
- *animation = 175;
+ *animation = kModelAnimationGuzzaWithGunGotHitStraight;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(175)) {
- *animation = 172;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWithGunGotHitStraight)) {
+ *animation = kModelAnimationGuzzaWithGunIdle;
_animationFrame = 0;
_animationState = 24;
Actor_Change_Animation_Mode(kActorGuzza, kAnimationModeCombatIdle);
@@ -708,30 +708,30 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
break;
case 29:
- *animation = 182;
+ *animation = kModelAnimationGuzzaWithGunUnholsterGun;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(182)) {
- *animation = 172;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWithGunUnholsterGun)) {
+ *animation = kModelAnimationGuzzaWithGunIdle;
_animationFrame = 0;
_animationState = 24;
}
break;
case 30:
- *animation = 183;
+ *animation = kModelAnimationGuzzaWithGunHolsterGun;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(183)) {
- *animation = 197;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWithGunHolsterGun)) {
+ *animation = kModelAnimationGuzzaStandIdle;
_animationFrame = 0;
_animationState = 0;
}
break;
case 31:
- *animation = 184;
+ *animation = kModelAnimationGuzzaWithGunShooting;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(184)) {
- *animation = 172;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWithGunShooting)) {
+ *animation = kModelAnimationGuzzaWithGunIdle;
_animationFrame = 0;
_animationState = 24;
Actor_Change_Animation_Mode(kActorGuzza, kAnimationModeCombatIdle);
@@ -739,10 +739,10 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
break;
case 32:
- *animation = 200;
+ *animation = kModelAnimationGuzzaStandAndGiveOrPutHigh;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(200)) {
- *animation = 197;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaStandAndGiveOrPutHigh)) {
+ *animation = kModelAnimationGuzzaStandIdle;
_animationFrame = 0;
_animationState = 0;
Actor_Change_Animation_Mode(kActorGuzza, kAnimationModeIdle);
@@ -750,9 +750,9 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
break;
case 33:
- *animation = 207;
+ *animation = kModelAnimationGuzzaWithGunShotFallBackwards;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(207)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWithGunShotFallBackwards)) {
_animationFrame = Slice_Animation_Query_Number_Of_Frames(*animation) - 1;
float x, y, z;
Actor_Query_XYZ(kActorGuzza, &x, &y, &z);
@@ -769,11 +769,12 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
break;
case 34:
- *animation = 207;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(207) - 1;
+ *animation = kModelAnimationGuzzaWithGunShotFallBackwards;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationGuzzaWithGunShotFallBackwards) - 1;
break;
default:
+ // TODO a bug? 399 is a Zuben animation
*animation = 399;
break;
}
@@ -844,7 +845,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
_animationState = 2;
_animationFrame = 0;
_animationStateNext = 11;
- _animationNext = 201;
+ _animationNext = kModelAnimationGuzzaStandAndSuggestTalk;
}
break;
@@ -884,7 +885,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
_animationState = 2;
_animationFrame = 0;
_animationStateNext = 12;
- _animationNext = 202;
+ _animationNext = kModelAnimationGuzzaStandAndExplainOneHandMoveTalk;
}
break;
@@ -897,7 +898,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
_animationState = 2;
_animationFrame = 0;
_animationStateNext = 13;
- _animationNext = 203;
+ _animationNext = kModelAnimationGuzzaStandAndExplainBothHandsMoveTalk;
}
break;
@@ -910,7 +911,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
_animationState = 2;
_animationFrame = 0;
_animationStateNext = 14;
- _animationNext = 204;
+ _animationNext = kModelAnimationGuzzaStandAndGiveOrThrowWaistLevel;
}
break;
@@ -923,7 +924,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
_animationState = 2;
_animationFrame = 0;
_animationStateNext = 15;
- _animationNext = 205;
+ _animationNext = kModelAnimationGuzzaStandAndDismissiveOneHandMoveTalk;
}
break;
@@ -936,7 +937,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
_animationState = 2;
_animationFrame = 0;
_animationStateNext = 16;
- _animationNext = 206;
+ _animationNext = kModelAnimationGuzzaStandAndDismissiveBothHandsMoveTalk;
}
break;
@@ -958,7 +959,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
if (_animationState == 1) {
_animationState = 3;
_animationStateNext = 17;
- _animationNext = 192;
+ _animationNext = kModelAnimationGuzzaSitAndSmallHandMoveTalk;
} else {
_animationState = 17;
_animationFrame = 0;
@@ -970,7 +971,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
if (_animationState == 1) {
_animationState = 3;
_animationStateNext = 18;
- _animationNext = 193;
+ _animationNext = kModelAnimationGuzzaSitAndSmallBothHandsMoveTalk;
} else {
_animationState = 18;
_animationFrame = 0;
@@ -982,7 +983,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
if (_animationState == 1) {
_animationState = 3;
_animationStateNext = 19;
- _animationNext = 194;
+ _animationNext = kModelAnimationGuzzaSitAndLargerHandMoveTalk;
} else {
_animationState = 19;
_animationFrame = 0;
@@ -994,7 +995,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
if (_animationState == 1) {
_animationState = 3;
_animationStateNext = 20;
- _animationNext = 195;
+ _animationNext = kModelAnimationGuzzaSitAndUpsetHandMoveTalk;
} else {
_animationState = 20;
_animationFrame = 0;
@@ -1006,7 +1007,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
if (_animationState == 1) {
_animationState = 3;
_animationStateNext = 21;
- _animationNext = 196;
+ _animationNext = kModelAnimationGuzzaSitAndDismissHandMoveTalk;
} else {
_animationState = 21;
_animationFrame = 0;
More information about the Scummvm-git-logs
mailing list