[Scummvm-git-logs] scummvm master -> d88fe480c598c1de2a87b5a7650b1af3263804f3
antoniou79
a.antoniou79 at gmail.com
Wed Dec 16 12:41:13 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d88fe480c5 BLADERUNNER: Describe remaining model animations
Commit: d88fe480c598c1de2a87b5a7650b1af3263804f3
https://github.com/scummvm/scummvm/commit/d88fe480c598c1de2a87b5a7650b1af3263804f3
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2020-12-16T14:38:59+02:00
Commit Message:
BLADERUNNER: Describe remaining model animations
bullet bob, insect_dealer, tyrell_guard, runciter
Changed paths:
engines/bladerunner/game_constants.h
engines/bladerunner/script/ai/bullet_bob.cpp
engines/bladerunner/script/ai/gaff.cpp
engines/bladerunner/script/ai/insect_dealer.cpp
engines/bladerunner/script/ai/runciter.cpp
engines/bladerunner/script/ai/tyrell_guard.cpp
engines/bladerunner/script/ai_script.h
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 7b5d756d9d..373586534d 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -2218,13 +2218,69 @@ enum GameModelAnimations {
kModelAnimationTransientSearchingTrash = 504,
kModelAnimationTransientSearchingTrashToIdle = 505,
// 506 - 525: Bullet Bob animations
- // TODO
+ kModelAnimationBulletBobSittingCombatIdle = 506,
+ kModelAnimationBulletBobSittingCombatGotHit = 507, // UNUSED
+ kModelAnimationBulletBobSittingCombatStrafeSlow = 508, // UNUSED
+ kModelAnimationBulletBobSittingCombatStrafeFast = 509, // UNUSED
+ kModelAnimationBulletBobSittingCombatShotDead = 510,
+ kModelAnimationBulletBobSittingCombatTalk = 511, // UNUSED
+ kModelAnimationBulletBobSittingCombatRetrievesGun = 512,
+ kModelAnimationBulletBobSittingCombatFiresGun = 513,
+ kModelAnimationBulletBobSittingIdle = 514,
+ kModelAnimationBulletBobSittingHeadMoveAround = 515, // UNUSED - RESTORED
+ kModelAnimationBulletBobSittingHeadMoveDownThink = 516,
+ kModelAnimationBulletBobSittingCalmTalk = 517,
+ kModelAnimationBulletBobSittingDismissiveTalk = 518,
+ kModelAnimationBulletBobSittingSuggestTalk = 519,
+ kModelAnimationBulletBobSittingQuickSuggestTalk = 520,
+ kModelAnimationBulletBobSittingExplainTalk = 521,
+ kModelAnimationBulletBobSittingGossipTalk = 522,
+ kModelAnimationBulletBobSittingHeadNodLeftTalk = 523,
+ kModelAnimationBulletBobSittingPersistentTalk = 524,
+ kModelAnimationBulletBobSittingThumbsUp = 525, // TODO when is this used? animationMode 23
// 526 - 544: Runciter animations
- // TODO
+ kModelAnimationRunciterWalking = 526,
+ kModelAnimationRunciterGotHit = 527, // UNUSED
+ kModelAnimationRunciterShotDead = 528,
+ kModelAnimationRunciterIdle = 529,
+ kModelAnimationRunciterScratchesWoundIdle = 530,
+ kModelAnimationRunciterPicksNose = 531,
+ kModelAnimationRunciterGestureGive = 532,
+ kModelAnimationRunciterCalmTalk = 533,
+ kModelAnimationRunciterSuggestOnTipToesTalk = 534, // TODO why does he seem on tip-toes? Is someone holding him up?
+ kModelAnimationRunciterExplainTalk = 535,
+ kModelAnimationRunciterAngryTalk = 536,
+ kModelAnimationRunciterQuestionTalk = 537,
+ kModelAnimationRunciterOffensiveTalk = 538,
+ kModelAnimationRunciterComplainCryTalk = 539,
+ kModelAnimationRunciterDespairTalk = 540,
+ kModelAnimationRunciterCannotBelieveTalk = 541,
+ kModelAnimationRunciterAttack = 542, // UNUSED - TODO What is he supposed to be doing?
+ kModelAnimationRunciterDefendOrPourMove = 543, // UNUSED - TODO What is he supposed to be doing?
+ kModelAnimationRunciterProtectSelfMove = 544, // UNUSED - TODO What is he supposed to be doing?
// 545 - 554: Insect Dealer animations
- // TODO
+ kModelAnimationInsectDealerSittingIdle = 545,
+ kModelAnimationInsectDealerSittingScratchEarIdle = 546,
+ kModelAnimationInsectDealerSittingGestureGive = 547, // TODO is this used? animationMode: 23
+ kModelAnimationInsectDealerSittingCalmTalk = 548,
+ kModelAnimationInsectDealerSittingExplainTalk = 549,
+ kModelAnimationInsectDealerSittingPointingTalk = 550,
+ kModelAnimationInsectDealerSittingHeadMoveTalk = 551,
+ kModelAnimationInsectDealerSittingSuggestTalk = 552,
+ kModelAnimationInsectDealerSittingGossipTalk = 553,
+ kModelAnimationInsectDealerSittingDescriptiveTalk = 554,
// 555 - 565: Tyrell Guard animations
- // TODO
+ kModelAnimationTyrellGuardSittingIdle = 555,
+ kModelAnimationTyrellGuardSittingLookingAtMonitorIdle = 556, // UNUSED
+ kModelAnimationTyrellGuardSittingGestureGive = 557,
+ kModelAnimationTyrellGuardSittingCalmTalk = 558,
+ kModelAnimationTyrellGuardSittingExplainTalk = 559,
+ kModelAnimationTyrellGuardSittingHandOverHeadTalk = 560,
+ kModelAnimationTyrellGuardSittingSuggestTalk = 561,
+ kModelAnimationTyrellGuardSittingUpsetTalk = 562,
+ kModelAnimationTyrellGuardSittingMaybeHugsMonitors = 563, // ??? untriggered
+ kModelAnimationTyrellGuardSittingSleepingWakingUp = 564, // Triggered to play partially (states 1, 2)
+ kModelAnimationTyrellGuardSittingPressingAlertButton = 565, // TODO check - does this actually get triggered? animationMode 50
// 566 - 570: Mia animations
kModelAnimationMiaIdle = 566,
kModelAnimationMiaGestureGive = 567, // TODO when is this used? animationMode 23
diff --git a/engines/bladerunner/script/ai/bullet_bob.cpp b/engines/bladerunner/script/ai/bullet_bob.cpp
index b07d3ae709..9bd83b68f5 100644
--- a/engines/bladerunner/script/ai/bullet_bob.cpp
+++ b/engines/bladerunner/script/ai/bullet_bob.cpp
@@ -25,10 +25,11 @@
namespace BladeRunner {
AIScriptBulletBob::AIScriptBulletBob(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _var1 = 0;
+ // _varChooseIdleAnimation can have valid values: 0, 1
+ _varChooseIdleAnimation = 0;
_var2 = 6;
_var3 = 1;
- _var4 = 0;
+ _varNumOfTimesToHoldCurrentFrame = 0;
}
void AIScriptBulletBob::Initialize() {
@@ -37,10 +38,10 @@ void AIScriptBulletBob::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _var1 = 0;
+ _varChooseIdleAnimation = 0;
_var2 = 6;
_var3 = 1;
- _var4 = 0;
+ _varNumOfTimesToHoldCurrentFrame = 0;
Actor_Set_Goal_Number(kActorBulletBob, kGoalBulletBobDefault);
Actor_Set_Targetable(kActorBulletBob, true);
@@ -205,63 +206,74 @@ bool AIScriptBulletBob::GoalChanged(int currentGoalNumber, int newGoalNumber) {
bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
switch (_animationState) {
case 0:
- if (_var1 == 1) {
- *animation = 516;
- if (_var4) {
- --_var4;
+ if (_varChooseIdleAnimation == 1) {
+#if BLADERUNNER_ORIGINAL_BUGS
+ // TODO a bug? Why use kModelAnimationBulletBobSittingHeadMoveDownThink (516) here
+ // and leave kModelAnimationBulletBobSittingHeadMoveAround (515) unused?
+ // Also below kModelAnimationBulletBobSittingHeadMoveAround (515) is used
+ // in Slice_Animation_Query_Number_Of_Frames(),
+ // even though the count of frames is identical in both 515 and 516 framesets
+ *animation = kModelAnimationBulletBobSittingHeadMoveDownThink;
+#else
+ *animation = kModelAnimationBulletBobSittingHeadMoveAround;
+#endif
+ if (_varNumOfTimesToHoldCurrentFrame > 0) {
+ --_varNumOfTimesToHoldCurrentFrame;
} else {
if (++_animationFrame == 6) {
- _var4 = Random_Query(4, 8);
+ _varNumOfTimesToHoldCurrentFrame = Random_Query(4, 8);
}
if (_animationFrame == 11) {
- _var4 = Random_Query(2, 6);
+ _varNumOfTimesToHoldCurrentFrame = Random_Query(2, 6);
}
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(515)) {
+ // frames in frameset kModelAnimationBulletBobSittingHeadMoveAround (515): 16
+ // frames in frameset kModelAnimationBulletBobSittingHeadMoveDownThink (kModelAnimationBulletBobSittingHeadMoveDownThink): 16
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingHeadMoveAround)) {
_animationFrame = 0;
- _var1 = 0;
+ _varChooseIdleAnimation = 0;
_var3 = 2 * Random_Query(0, 1) - 1;
_var2 = Random_Query(3, 7);
- _var4 = Random_Query(0, 4);
+ _varNumOfTimesToHoldCurrentFrame = Random_Query(0, 4);
}
}
- } else if (_var1 == 0) {
- *animation = 514;
- if (_var4) {
- --_var4;
+ } else if (_varChooseIdleAnimation == 0) {
+ *animation = kModelAnimationBulletBobSittingIdle;
+ if (_varNumOfTimesToHoldCurrentFrame > 0) {
+ --_varNumOfTimesToHoldCurrentFrame;
} else {
_animationFrame += _var3;
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(514) - 1;
- } else if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(514)) {
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingIdle) - 1;
+ } else if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingIdle)) {
_animationFrame = 0;
}
if (!--_var2) {
_var3 = 2 * Random_Query(0, 1) - 1;
_var2 = Random_Query(3, 7);
- _var4 = Random_Query(0, 4);
+ _varNumOfTimesToHoldCurrentFrame = Random_Query(0, 4);
}
if (_animationFrame == 0) {
- _var1 = Random_Query(0, 1);
+ _varChooseIdleAnimation = Random_Query(0, 1);
}
}
}
break;
case 1:
- *animation = 506;
+ *animation = kModelAnimationBulletBobSittingCombatIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(506)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingCombatIdle)) {
_animationFrame = 0;
}
break;
case 2:
- *animation = 513;
+ *animation = kModelAnimationBulletBobSittingCombatFiresGun;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(513)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingCombatFiresGun)) {
_animationFrame = 0;
_animationState = 1;
- *animation = 506;
+ *animation = kModelAnimationBulletBobSittingCombatIdle;
}
if (_animationFrame == 10) {
Sound_Play(kSfxSHOTCOK1, 75, 0, 0, 50);
@@ -273,10 +285,10 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
break;
case 3:
- *animation = 510;
+ *animation = kModelAnimationBulletBobSittingCombatShotDead;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(510) - 1) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(510) - 1;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingCombatShotDead) - 1) {
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingCombatShotDead) - 1;
_animationState = 16;
Game_Flag_Set(kFlagRC04McCoyShotBob);
}
@@ -286,109 +298,109 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
break;
case 5:
- *animation = 525;
+ *animation = kModelAnimationBulletBobSittingThumbsUp;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(525)) {
- *animation = 514;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingThumbsUp)) {
+ *animation = kModelAnimationBulletBobSittingIdle;
_animationFrame = 0;
_animationState = 0;
}
break;
case 6:
- *animation = 517;
+ *animation = kModelAnimationBulletBobSittingCalmTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(517)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingCalmTalk)) {
_animationFrame = 0;
}
break;
case 7:
- *animation = 518;
+ *animation = kModelAnimationBulletBobSittingDismissiveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(518)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingDismissiveTalk)) {
_animationFrame = 0;
_animationState = 6;
- *animation = 517;
+ *animation = kModelAnimationBulletBobSittingCalmTalk;
}
break;
case 8:
- *animation = 519;
+ *animation = kModelAnimationBulletBobSittingSuggestTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(519)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingSuggestTalk)) {
_animationFrame = 0;
_animationState = 6;
- *animation = 517;
+ *animation = kModelAnimationBulletBobSittingCalmTalk;
}
break;
case 9:
- *animation = 520;
+ *animation = kModelAnimationBulletBobSittingQuickSuggestTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(520)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingQuickSuggestTalk)) {
_animationFrame = 0;
_animationState = 6;
- *animation = 517;
+ *animation = kModelAnimationBulletBobSittingCalmTalk;
}
break;
case 10:
- *animation = 521;
+ *animation = kModelAnimationBulletBobSittingExplainTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(521)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingExplainTalk)) {
_animationFrame = 0;
_animationState = 6;
- *animation = 517;
+ *animation = kModelAnimationBulletBobSittingCalmTalk;
}
break;
case 11:
- *animation = 522;
+ *animation = kModelAnimationBulletBobSittingGossipTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(522)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingGossipTalk)) {
_animationFrame = 0;
_animationState = 6;
- *animation = 517;
+ *animation = kModelAnimationBulletBobSittingCalmTalk;
}
break;
case 12:
- *animation = 523;
+ *animation = kModelAnimationBulletBobSittingHeadNodLeftTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(523)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingHeadNodLeftTalk)) {
_animationFrame = 0;
_animationState = 6;
- *animation = 517;
+ *animation = kModelAnimationBulletBobSittingCalmTalk;
}
break;
case 13:
- *animation = 524;
+ *animation = kModelAnimationBulletBobSittingPersistentTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(524)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingPersistentTalk)) {
_animationFrame = 0;
_animationState = 6;
- *animation = 517;
+ *animation = kModelAnimationBulletBobSittingCalmTalk;
}
break;
case 14:
- *animation = 512;
+ *animation = kModelAnimationBulletBobSittingCombatRetrievesGun;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(512)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingCombatRetrievesGun)) {
_animationFrame = 0;
_animationState = 1;
- *animation = 506;
+ *animation = kModelAnimationBulletBobSittingCombatIdle;
}
break;
case 15:
- if (_var1 == 1) {
- *animation = 516;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(516)) {
+ if (_varChooseIdleAnimation == 1) {
+ *animation = kModelAnimationBulletBobSittingHeadMoveDownThink;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingHeadMoveDownThink)) {
_animationFrame += 2;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(516)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingHeadMoveDownThink)) {
_animationFrame = 0;
*animation = _animationNext;
_animationState = _animationStateNext;
@@ -401,11 +413,11 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
_animationState = _animationStateNext;
}
}
- } else if (_var1 == 0) {
- *animation = 514;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(514)) {
+ } else if (_varChooseIdleAnimation == 0) {
+ *animation = kModelAnimationBulletBobSittingIdle;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingIdle)) {
_animationFrame += 2;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(514)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingIdle)) {
_animationFrame = 0;
*animation = _animationNext;
_animationState = _animationStateNext;
@@ -422,8 +434,8 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
break;
case 16:
- *animation = 510;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(510) - 1;
+ *animation = kModelAnimationBulletBobSittingCombatShotDead;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingCombatShotDead) - 1;
break;
default:
@@ -452,7 +464,7 @@ bool AIScriptBulletBob::ChangeAnimationMode(int mode) {
if (_animationState < 6 || _animationState > 13) {
_animationState = 15;
_animationStateNext = 6;
- _animationNext = 517;
+ _animationNext = kModelAnimationBulletBobSittingCalmTalk;
}
break;
@@ -474,7 +486,7 @@ bool AIScriptBulletBob::ChangeAnimationMode(int mode) {
if (_animationState < 6 || _animationState > 13) {
_animationState = 15;
_animationStateNext = 7;
- _animationNext = 518;
+ _animationNext = kModelAnimationBulletBobSittingDismissiveTalk;
}
break;
@@ -484,7 +496,7 @@ bool AIScriptBulletBob::ChangeAnimationMode(int mode) {
if (_animationState < 6 || _animationState > 13) {
_animationState = 15;
_animationStateNext = 9;
- _animationNext = 520;
+ _animationNext = kModelAnimationBulletBobSittingQuickSuggestTalk;
}
break;
@@ -504,7 +516,7 @@ bool AIScriptBulletBob::ChangeAnimationMode(int mode) {
if (_animationState < 6 || _animationState > 13) {
_animationState = 15;
_animationStateNext = 8;
- _animationNext = 519;
+ _animationNext = kModelAnimationBulletBobSittingSuggestTalk;
}
break;
@@ -512,7 +524,7 @@ bool AIScriptBulletBob::ChangeAnimationMode(int mode) {
if (_animationState < 6 || _animationState > 13) {
_animationState = 15;
_animationStateNext = 10;
- _animationNext = 521;
+ _animationNext = kModelAnimationBulletBobSittingExplainTalk;
}
break;
@@ -520,7 +532,7 @@ bool AIScriptBulletBob::ChangeAnimationMode(int mode) {
if (_animationState < 6 || _animationState > 13) {
_animationState = 15;
_animationStateNext = 11;
- _animationNext = 522;
+ _animationNext = kModelAnimationBulletBobSittingGossipTalk;
}
break;
@@ -528,7 +540,7 @@ bool AIScriptBulletBob::ChangeAnimationMode(int mode) {
if (_animationState < 6 || _animationState > 13) {
_animationState = 15;
_animationStateNext = 12;
- _animationNext = 523;
+ _animationNext = kModelAnimationBulletBobSittingHeadNodLeftTalk;
}
break;
@@ -536,7 +548,7 @@ bool AIScriptBulletBob::ChangeAnimationMode(int mode) {
if (_animationState < 6 || _animationState > 13) {
_animationState = 15;
_animationStateNext = 13;
- _animationNext = 524;
+ _animationNext = kModelAnimationBulletBobSittingPersistentTalk;
}
break;
@@ -547,7 +559,7 @@ bool AIScriptBulletBob::ChangeAnimationMode(int mode) {
case 88:
_animationState = 16;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(510) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationBulletBobSittingCombatShotDead) - 1;
break;
default:
diff --git a/engines/bladerunner/script/ai/gaff.cpp b/engines/bladerunner/script/ai/gaff.cpp
index a777053a4b..3d5f7a87c0 100644
--- a/engines/bladerunner/script/ai/gaff.cpp
+++ b/engines/bladerunner/script/ai/gaff.cpp
@@ -411,11 +411,15 @@ bool AIScriptGaff::UpdateAnimation(int *animation, int *frame) {
case 8:
*animation = kModelAnimationGaffEntersSpinner;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMcCoyEntersSpinner) - 1) { // Bug in the game?
+ // TODO Bug in the game? Why check against McCoy's animation's frameset number of frames?
+ // kModelAnimationMcCoyEntersSpinner: 25 frames
+ // kModelAnimationGaffEntersSpinner: 31 frames
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationMcCoyEntersSpinner) - 1) {
Actor_Set_Invisible(kActorGaff, true);
*animation = kModelAnimationGaffIdle;
_animationFrame = 0;
- Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeIdle); // TODO: check this, it was set directly by calling actor script
+ // TODO: check this, it was set directly by calling actor script
+ Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeIdle);
Actor_Set_Goal_Number(kActorGaff, kGoalGaffCT12Leave);
}
break;
diff --git a/engines/bladerunner/script/ai/insect_dealer.cpp b/engines/bladerunner/script/ai/insect_dealer.cpp
index 05614bca54..70eadb9bea 100644
--- a/engines/bladerunner/script/ai/insect_dealer.cpp
+++ b/engines/bladerunner/script/ai/insect_dealer.cpp
@@ -132,8 +132,8 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
case 0:
switch (_state) {
case 0:
- *animation = 545;
- if (_counter) {
+ *animation = kModelAnimationInsectDealerSittingIdle;
+ if (_counter > 0) {
--_counter;
if (Random_Query(0, 6) == 0) {
_frameDelta = -_frameDelta;
@@ -158,11 +158,11 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
break;
case 1:
- *animation = 546;
+ *animation = kModelAnimationInsectDealerSittingScratchEarIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(546)) {
- *animation = 545;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationInsectDealerSittingScratchEarIdle)) {
+ *animation = kModelAnimationInsectDealerSittingIdle;
_animationFrame = 0;
_state = 0;
_var2 = Random_Query(6, 14);
@@ -178,12 +178,12 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
case 1:
if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
- *animation = 545;
+ *animation = kModelAnimationInsectDealerSittingIdle;
_animationState = 0;
} else {
- *animation = 548;
+ *animation = kModelAnimationInsectDealerSittingCalmTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(548)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationInsectDealerSittingCalmTalk)) {
_animationFrame = 0;
_animationState = 0;
}
@@ -191,70 +191,70 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
break;
case 2:
- *animation = 549;
+ *animation = kModelAnimationInsectDealerSittingExplainTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(549)) {
- *animation = 548;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationInsectDealerSittingExplainTalk)) {
+ *animation = kModelAnimationInsectDealerSittingCalmTalk;
_animationFrame = 0;
_animationState = 1;
}
break;
case 3:
- *animation = 550;
+ *animation = kModelAnimationInsectDealerSittingPointingTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(550)) {
- *animation = 548;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationInsectDealerSittingPointingTalk)) {
+ *animation = kModelAnimationInsectDealerSittingCalmTalk;
_animationFrame = 0;
_animationState = 1;
}
break;
case 4:
- *animation = 551;
+ *animation = kModelAnimationInsectDealerSittingHeadMoveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(551)) {
- *animation = 548;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationInsectDealerSittingHeadMoveTalk)) {
+ *animation = kModelAnimationInsectDealerSittingCalmTalk;
_animationFrame = 0;
_animationState = 1;
}
break;
case 5:
- *animation = 552;
+ *animation = kModelAnimationInsectDealerSittingSuggestTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(552)) {
- *animation = 548;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationInsectDealerSittingSuggestTalk)) {
+ *animation = kModelAnimationInsectDealerSittingCalmTalk;
_animationFrame = 0;
_animationState = 1;
}
break;
case 6:
- *animation = 553;
+ *animation = kModelAnimationInsectDealerSittingGossipTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(553)) {
- *animation = 548;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationInsectDealerSittingGossipTalk)) {
+ *animation = kModelAnimationInsectDealerSittingCalmTalk;
_animationFrame = 0;
_animationState = 1;
}
break;
case 7:
- *animation = 554;
+ *animation = kModelAnimationInsectDealerSittingDescriptiveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(554)) {
- *animation = 548;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationInsectDealerSittingDescriptiveTalk)) {
+ *animation = kModelAnimationInsectDealerSittingCalmTalk;
_animationFrame = 0;
_animationState = 1;
}
break;
case 8:
- *animation = 547;
+ *animation = kModelAnimationInsectDealerSittingGestureGive;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(547)) {
- *animation = 545;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationInsectDealerSittingGestureGive)) {
+ *animation = kModelAnimationInsectDealerSittingIdle;
_animationFrame = 0;
_animationState = 0;
}
diff --git a/engines/bladerunner/script/ai/runciter.cpp b/engines/bladerunner/script/ai/runciter.cpp
index d6e58fa897..fb522130ec 100644
--- a/engines/bladerunner/script/ai/runciter.cpp
+++ b/engines/bladerunner/script/ai/runciter.cpp
@@ -32,10 +32,11 @@ enum kRunciterStates {
};
AIScriptRunciter::AIScriptRunciter(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- var_45CD78 = 0;
+ // _varChooseIdleAnimation can have valid values: 0, 1, 2
+ _varChooseIdleAnimation = 0;
var_45CD7C = 0;
var_45CD80 = 0;
- var_45CD84 = 0;
+ _varNumOfTimesToHoldCurrentFrame = 0;
var_45CD88 = 0;
}
@@ -43,10 +44,10 @@ void AIScriptRunciter::Initialize() {
_animationState = 0;
_animationFrame = 0;
_animationStateNext = 0;
- var_45CD78 = 0;
+ _varChooseIdleAnimation = 0;
var_45CD7C = 6;
var_45CD80 = 1;
- var_45CD84 = 0;
+ _varNumOfTimesToHoldCurrentFrame = 0;
var_45CD88 = 0;
Actor_Set_Goal_Number(kActorRunciter, kGoalRunciterDefault);
}
@@ -230,56 +231,56 @@ bool AIScriptRunciter::GoalChanged(int currentGoalNumber, int newGoalNumber) {
bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
switch (_animationState) {
case kRunciterStateIdle:
- if (var_45CD78 == 0) {
- *animation = 529;
- if (var_45CD84) {
- --var_45CD84;
+ if (_varChooseIdleAnimation == 0) {
+ *animation = kModelAnimationRunciterIdle;
+ if (_varNumOfTimesToHoldCurrentFrame > 0) {
+ --_varNumOfTimesToHoldCurrentFrame;
} else {
_animationFrame += var_45CD80;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(529)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterIdle)) {
_animationFrame = 0;
}
if (_animationFrame < 0) {
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(529) - 1;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterIdle) - 1;
}
--var_45CD7C;
if (var_45CD7C == 0) {
var_45CD80 = 2 * Random_Query(0, 1) - 1;
var_45CD7C = Random_Query(6, 14);
- var_45CD84 = Random_Query(0, 4);
+ _varNumOfTimesToHoldCurrentFrame = Random_Query(0, 4);
}
if (_animationFrame == 0) {
if (Random_Query(0, 1) == 1) {
- var_45CD78 = Random_Query(1, 2);
+ _varChooseIdleAnimation = Random_Query(1, 2);
var_45CD80 = 1;
- var_45CD84 = 0;
+ _varNumOfTimesToHoldCurrentFrame = 0;
}
}
}
- } else if (var_45CD78 == 1) {
- *animation = 530;
+ } else if (_varChooseIdleAnimation == 1) {
+ *animation = kModelAnimationRunciterScratchesWoundIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(530)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterScratchesWoundIdle)) {
_animationFrame = 0;
- var_45CD78 = 0;
- *animation = 529;
+ _varChooseIdleAnimation = 0;
+ *animation = kModelAnimationRunciterIdle;
var_45CD7C = Random_Query(6, 14);
var_45CD80 = 2 * Random_Query(0, 1) - 1;
}
- } else if (var_45CD78 == 2) {
- *animation = 531;
- if (var_45CD84) {
- --var_45CD84;
+ } else if (_varChooseIdleAnimation == 2) {
+ *animation = kModelAnimationRunciterPicksNose;
+ if (_varNumOfTimesToHoldCurrentFrame > 0) {
+ --_varNumOfTimesToHoldCurrentFrame;
} else {
_animationFrame += var_45CD80;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
- var_45CD84 = Random_Query(5, 15);
+ _varNumOfTimesToHoldCurrentFrame = Random_Query(5, 15);
var_45CD80 = -1;
}
if (_animationFrame <= 0) {
_animationFrame = 0;
- var_45CD78 = 0;
- *animation = 529;
+ _varChooseIdleAnimation = 0;
+ *animation = kModelAnimationRunciterIdle;
var_45CD7C = Random_Query(6, 14);
var_45CD80 = 2 * Random_Query(0, 1) - 1;
}
@@ -289,23 +290,23 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
break;
case kRunciterStateWalking:
- *animation = 526;
+ *animation = kModelAnimationRunciterWalking;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(526)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterWalking)) {
_animationFrame = 0;
}
*frame = _animationFrame;
break;
case 2:
- *animation = 533;
+ *animation = kModelAnimationRunciterCalmTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(533)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterCalmTalk)) {
_animationFrame = 0;
- if (var_45CD88) {
- *animation = 529;
+ if (var_45CD88 > 0) {
+ *animation = kModelAnimationRunciterIdle;
_animationState = 0;
- var_45CD78 = 0;
+ _varChooseIdleAnimation = 0;
} else {
_animationState = 4;
}
@@ -314,16 +315,16 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
break;
case 4:
- *animation = 534;
+ *animation = kModelAnimationRunciterSuggestOnTipToesTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(534)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterSuggestOnTipToesTalk)) {
_animationFrame = 0;
- if (var_45CD88) {
- *animation = 529;
+ if (var_45CD88 > 0) {
+ *animation = kModelAnimationRunciterIdle;
_animationState = 0;
- var_45CD78 = 0;
+ _varChooseIdleAnimation = 0;
} else {
- *animation = 533;
+ *animation = kModelAnimationRunciterCalmTalk;
_animationState = 2;
}
}
@@ -331,16 +332,16 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
break;
case 5:
- *animation = 535;
+ *animation = kModelAnimationRunciterExplainTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(535)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterExplainTalk)) {
_animationFrame = 0;
- if (var_45CD88) {
- *animation = 529;
+ if (var_45CD88 > 0) {
+ *animation = kModelAnimationRunciterIdle;
_animationState = 0;
- var_45CD78 = 0;
+ _varChooseIdleAnimation = 0;
} else {
- *animation = 533;
+ *animation = kModelAnimationRunciterCalmTalk;
_animationState = 2;
}
}
@@ -348,16 +349,16 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
break;
case 6:
- *animation = 536;
+ *animation = kModelAnimationRunciterAngryTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(536)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterAngryTalk)) {
_animationFrame = 0;
- if (var_45CD88) {
- *animation = 529;
+ if (var_45CD88 > 0) {
+ *animation = kModelAnimationRunciterIdle;
_animationState = 0;
- var_45CD78 = 0;
+ _varChooseIdleAnimation = 0;
} else {
- *animation = 533;
+ *animation = kModelAnimationRunciterCalmTalk;
_animationState = 2;
}
}
@@ -365,16 +366,16 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
break;
case 7:
- *animation = 537;
+ *animation = kModelAnimationRunciterQuestionTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(537)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterQuestionTalk)) {
_animationFrame = 0;
- if (var_45CD88) {
- *animation = 529;
+ if (var_45CD88 > 0) {
+ *animation = kModelAnimationRunciterIdle;
_animationState = 0;
- var_45CD78 = 0;
+ _varChooseIdleAnimation = 0;
} else {
- *animation = 533;
+ *animation = kModelAnimationRunciterCalmTalk;
_animationState = 2;
}
}
@@ -382,16 +383,16 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
break;
case 8:
- *animation = 538;
+ *animation = kModelAnimationRunciterOffensiveTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(538)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterOffensiveTalk)) {
_animationFrame = 0;
- if (var_45CD88) {
- *animation = 529;
+ if (var_45CD88 > 0) {
+ *animation = kModelAnimationRunciterIdle;
_animationState = 0;
- var_45CD78 = 0;
+ _varChooseIdleAnimation = 0;
} else {
- *animation = 533;
+ *animation = kModelAnimationRunciterCalmTalk;
_animationState = 2;
}
}
@@ -399,16 +400,16 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
break;
case 9:
- *animation = 539;
+ *animation = kModelAnimationRunciterComplainCryTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(539)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterComplainCryTalk)) {
_animationFrame = 0;
- if (var_45CD88) {
- *animation = 529;
+ if (var_45CD88 > 0) {
+ *animation = kModelAnimationRunciterIdle;
_animationState = 0;
- var_45CD78 = 0;
+ _varChooseIdleAnimation = 0;
} else {
- *animation = 533;
+ *animation = kModelAnimationRunciterCalmTalk;
_animationState = 2;
}
}
@@ -416,16 +417,16 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
break;
case 10:
- *animation = 540;
+ *animation = kModelAnimationRunciterDespairTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(540)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterDespairTalk)) {
_animationFrame = 0;
- if (var_45CD88) {
- *animation = 529;
+ if (var_45CD88 > 0) {
+ *animation = kModelAnimationRunciterIdle;
_animationState = 0;
- var_45CD78 = 0;
+ _varChooseIdleAnimation = 0;
} else {
- *animation = 533;
+ *animation = kModelAnimationRunciterCalmTalk;
_animationState = 2;
}
}
@@ -433,15 +434,15 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
break;
case 11:
- *animation = 541;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(541)) {
+ *animation = kModelAnimationRunciterCannotBelieveTalk;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterCannotBelieveTalk)) {
_animationFrame = 0;
- if (var_45CD88) {
- *animation = 529;
+ if (var_45CD88 > 0) {
+ *animation = kModelAnimationRunciterIdle;
_animationState = 0;
- var_45CD78 = 0;
+ _varChooseIdleAnimation = 0;
} else {
- *animation = 533;
+ *animation = kModelAnimationRunciterCalmTalk;
_animationState = 2;
}
}
@@ -449,33 +450,33 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
break;
case 12:
- *animation = 532;
+ *animation = kModelAnimationRunciterGestureGive;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(532)) {
- *animation = 529;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterGestureGive)) {
+ *animation = kModelAnimationRunciterIdle;
_animationState = 0;
_animationFrame = 0;
- var_45CD78 = 0;
+ _varChooseIdleAnimation = 0;
Actor_Change_Animation_Mode(kActorRunciter, kAnimationModeCombatIdle);
}
*frame = _animationFrame;
break;
case 13:
- if (var_45CD78 == 0) {
+ if (_varChooseIdleAnimation == 0) {
_animationFrame = 0;
_animationState = _animationStateNext;
*animation = _animationNext;
- } else if (var_45CD78 == 1) {
- *animation = 530;
+ } else if (_varChooseIdleAnimation == 1) {
+ *animation = kModelAnimationRunciterScratchesWoundIdle;
_animationFrame += 3;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(530)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterScratchesWoundIdle)) {
_animationFrame = 0;
_animationState = _animationStateNext;
*animation = _animationNext;
}
- } else if (var_45CD78 == 2) {
- *animation = 531;
+ } else if (_varChooseIdleAnimation == 2) {
+ *animation = kModelAnimationRunciterPicksNose;
_animationFrame -= 3;
if (_animationFrame - 3 < 0) {
_animationFrame = 0;
@@ -487,18 +488,18 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
break;
case kRunciterStateDying:
- *animation = 528;
+ *animation = kModelAnimationRunciterShotDead;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(528) - 1) {
- *animation = 528;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterShotDead) - 1) {
+ *animation = kModelAnimationRunciterShotDead;
_animationState = kRunciterStateDead;
}
*frame = _animationFrame;
break;
case kRunciterStateDead:
- *animation = 528;
- _animationFrame = Slice_Animation_Query_Number_Of_Frames(528) - 1;
+ *animation = kModelAnimationRunciterShotDead;
+ _animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationRunciterShotDead) - 1;
*frame = _animationFrame;
break;
@@ -515,14 +516,12 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
bool AIScriptRunciter::ChangeAnimationMode(int mode) {
switch (mode) {
case kAnimationModeIdle:
- if (_animationState >= 2
- && _animationState <= 11
- ) {
+ if (_animationState >= 2 && _animationState <= 11) {
var_45CD88 = 1;
} else {
_animationState = 0;
_animationFrame = 0;
- var_45CD78 = 0;
+ _varChooseIdleAnimation = 0;
}
break;
@@ -533,7 +532,7 @@ bool AIScriptRunciter::ChangeAnimationMode(int mode) {
} else if (_animationState == 0) {
_animationState = 13;
_animationStateNext = 1;
- _animationNext = 526;
+ _animationNext = kModelAnimationRunciterWalking;
}
break;
@@ -544,7 +543,7 @@ bool AIScriptRunciter::ChangeAnimationMode(int mode) {
} else {
_animationState = 13;
_animationStateNext = 2;
- _animationNext = 526;
+ _animationNext = kModelAnimationRunciterWalking;
}
var_45CD88 = 0;
break;
@@ -556,7 +555,7 @@ bool AIScriptRunciter::ChangeAnimationMode(int mode) {
} else {
_animationState = 13;
_animationStateNext = 4;
- _animationNext = 534;
+ _animationNext = kModelAnimationRunciterSuggestOnTipToesTalk;
}
var_45CD88 = 0;
break;
@@ -568,7 +567,7 @@ bool AIScriptRunciter::ChangeAnimationMode(int mode) {
} else {
_animationState = 13;
_animationStateNext = 5;
- _animationNext = 535;
+ _animationNext = kModelAnimationRunciterExplainTalk;
}
var_45CD88 = 0;
break;
@@ -580,7 +579,7 @@ bool AIScriptRunciter::ChangeAnimationMode(int mode) {
} else {
_animationState = 13;
_animationStateNext = 6;
- _animationNext = 536;
+ _animationNext = kModelAnimationRunciterAngryTalk;
}
var_45CD88 = 0;
break;
@@ -592,7 +591,7 @@ bool AIScriptRunciter::ChangeAnimationMode(int mode) {
} else {
_animationState = 13;
_animationStateNext = 7;
- _animationNext = 537;
+ _animationNext = kModelAnimationRunciterQuestionTalk;
}
var_45CD88 = 0;
break;
@@ -604,7 +603,7 @@ bool AIScriptRunciter::ChangeAnimationMode(int mode) {
} else {
_animationState = 13;
_animationStateNext = 8;
- _animationNext = 538;
+ _animationNext = kModelAnimationRunciterOffensiveTalk;
}
var_45CD88 = 0;
break;
@@ -616,7 +615,7 @@ bool AIScriptRunciter::ChangeAnimationMode(int mode) {
} else {
_animationState = 13;
_animationStateNext = 9;
- _animationNext = 539;
+ _animationNext = kModelAnimationRunciterComplainCryTalk;
}
var_45CD88 = 0;
break;
@@ -628,7 +627,7 @@ bool AIScriptRunciter::ChangeAnimationMode(int mode) {
} else {
_animationState = 13;
_animationStateNext = 10;
- _animationNext = 540;
+ _animationNext = kModelAnimationRunciterDespairTalk;
}
var_45CD88 = 0;
break;
@@ -640,7 +639,7 @@ bool AIScriptRunciter::ChangeAnimationMode(int mode) {
} else {
_animationState = 13;
_animationStateNext = 11;
- _animationNext = 541;
+ _animationNext = kModelAnimationRunciterCannotBelieveTalk;
}
var_45CD88 = 0;
break;
diff --git a/engines/bladerunner/script/ai/tyrell_guard.cpp b/engines/bladerunner/script/ai/tyrell_guard.cpp
index 62c8cfb216..1286bbaf8b 100644
--- a/engines/bladerunner/script/ai/tyrell_guard.cpp
+++ b/engines/bladerunner/script/ai/tyrell_guard.cpp
@@ -148,15 +148,15 @@ bool AIScriptTyrellGuard::GoalChanged(int currentGoalNumber, int newGoalNumber)
bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
switch (_animationState) {
case 0:
- *animation = 555;
+ *animation = kModelAnimationTyrellGuardSittingIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(555)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationTyrellGuardSittingIdle)) {
_animationFrame = 0;
}
break;
case 1:
- *animation = 564;
+ *animation = kModelAnimationTyrellGuardSittingSleepingWakingUp;
if (_animationFrame <= 5) {
_frameDelta = 1;
} else if (_animationFrame >= 12) {
@@ -166,18 +166,18 @@ bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
break;
case 2:
- *animation = 564;
+ *animation = kModelAnimationTyrellGuardSittingSleepingWakingUp;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(564)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationTyrellGuardSittingSleepingWakingUp)) {
_animationFrame = 0;
_animationState = 0;
}
break;
case 3:
- *animation = 558;
+ *animation = kModelAnimationTyrellGuardSittingCalmTalk;
if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
- *animation = 555;
+ *animation = kModelAnimationTyrellGuardSittingIdle;
_animationState = 0;
} else {
++_animationFrame;
@@ -188,80 +188,80 @@ bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
break;
case 4:
- *animation = 559;
+ *animation = kModelAnimationTyrellGuardSittingExplainTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(559)) {
- *animation = 558;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationTyrellGuardSittingExplainTalk)) {
+ *animation = kModelAnimationTyrellGuardSittingCalmTalk;
_animationFrame = 0;
_animationState = 3;
}
break;
case 5:
- *animation = 560;
+ *animation = kModelAnimationTyrellGuardSittingHandOverHeadTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(560)) {
- *animation = 558;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationTyrellGuardSittingHandOverHeadTalk)) {
+ *animation = kModelAnimationTyrellGuardSittingCalmTalk;
_animationFrame = 0;
_animationState = 3;
}
break;
case 6:
- *animation = 561;
+ *animation = kModelAnimationTyrellGuardSittingSuggestTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(561)) {
- *animation = 558;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationTyrellGuardSittingSuggestTalk)) {
+ *animation = kModelAnimationTyrellGuardSittingCalmTalk;
_animationFrame = 0;
_animationState = 3;
}
break;
case 7:
- *animation = 562;
+ *animation = kModelAnimationTyrellGuardSittingUpsetTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(562)) {
- *animation = 558;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationTyrellGuardSittingUpsetTalk)) {
+ *animation = kModelAnimationTyrellGuardSittingCalmTalk;
_animationFrame = 0;
_animationState = 3;
}
break;
case 8:
- *animation = 557;
+ *animation = kModelAnimationTyrellGuardSittingGestureGive;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(557)) {
- *animation = 555;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationTyrellGuardSittingGestureGive)) {
+ *animation = kModelAnimationTyrellGuardSittingIdle;
_animationFrame = 0;
_animationState = 0;
}
break;
case 9:
- *animation = 563;
+ *animation = kModelAnimationTyrellGuardSittingMaybeHugsMonitors;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(563)) {
- *animation = 555;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationTyrellGuardSittingMaybeHugsMonitors)) {
+ *animation = kModelAnimationTyrellGuardSittingIdle;
_animationFrame = 0;
_animationState = 0;
}
break;
case 10:
- *animation = 564;
+ *animation = kModelAnimationTyrellGuardSittingSleepingWakingUp;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(564)) {
- *animation = 555;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationTyrellGuardSittingSleepingWakingUp)) {
+ *animation = kModelAnimationTyrellGuardSittingIdle;
_animationFrame = 0;
_animationState = 0;
}
break;
case 11:
- *animation = 565;
+ *animation = kModelAnimationTyrellGuardSittingPressingAlertButton;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(565)) {
- *animation = 555;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationTyrellGuardSittingPressingAlertButton)) {
+ *animation = kModelAnimationTyrellGuardSittingIdle;
_animationFrame = 0;
_animationState = 0;
}
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 607958349f..7e74f71cab 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -213,17 +213,17 @@ DECLARE_SCRIPT(Lance)
END_SCRIPT
DECLARE_SCRIPT(BulletBob)
- int _var1;
+ int _varChooseIdleAnimation;
int _var2;
int _var3;
- int _var4;
+ int _varNumOfTimesToHoldCurrentFrame;
END_SCRIPT
DECLARE_SCRIPT(Runciter)
- int var_45CD78;
+ int _varChooseIdleAnimation;
int var_45CD7C;
int var_45CD80;
- int var_45CD84;
+ int _varNumOfTimesToHoldCurrentFrame;
int var_45CD88;
END_SCRIPT
More information about the Scummvm-git-logs
mailing list