[Scummvm-git-logs] scummvm master -> cc5b61f6108e02d3f75222a62eefda0479408713
antoniou79
a.antoniou79 at gmail.com
Thu Dec 10 13:35:27 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:
cc5b61f610 BLADERUNNER: Lucy animation descriptions
Commit: cc5b61f6108e02d3f75222a62eefda0479408713
https://github.com/scummvm/scummvm/commit/cc5b61f6108e02d3f75222a62eefda0479408713
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2020-12-10T15:33:20+02:00
Commit Message:
BLADERUNNER: Lucy animation descriptions
Also replaced most instances of _flag to _resumeIdleAfterFramesetCompletesFlag where appropriate
Changed paths:
engines/bladerunner/game_constants.h
engines/bladerunner/script/ai/bullet_bob.cpp
engines/bladerunner/script/ai/chew.cpp
engines/bladerunner/script/ai/clovis.cpp
engines/bladerunner/script/ai/crazylegs.cpp
engines/bladerunner/script/ai/dektora.cpp
engines/bladerunner/script/ai/desk_clerk.cpp
engines/bladerunner/script/ai/early_q.cpp
engines/bladerunner/script/ai/early_q_bartender.cpp
engines/bladerunner/script/ai/fish_dealer.cpp
engines/bladerunner/script/ai/general_doll.cpp
engines/bladerunner/script/ai/gordo.cpp
engines/bladerunner/script/ai/guzza.cpp
engines/bladerunner/script/ai/hanoi.cpp
engines/bladerunner/script/ai/hasan.cpp
engines/bladerunner/script/ai/hawkers_barkeep.cpp
engines/bladerunner/script/ai/holloway.cpp
engines/bladerunner/script/ai/insect_dealer.cpp
engines/bladerunner/script/ai/isabella.cpp
engines/bladerunner/script/ai/izo.cpp
engines/bladerunner/script/ai/leon.cpp
engines/bladerunner/script/ai/lucy.cpp
engines/bladerunner/script/ai/luther.cpp
engines/bladerunner/script/ai/mia.cpp
engines/bladerunner/script/ai/murray.cpp
engines/bladerunner/script/ai/mutant1.cpp
engines/bladerunner/script/ai/mutant2.cpp
engines/bladerunner/script/ai/mutant3.cpp
engines/bladerunner/script/ai/officer_grayford.cpp
engines/bladerunner/script/ai/photographer.cpp
engines/bladerunner/script/ai/rachael.cpp
engines/bladerunner/script/ai/rajif.cpp
engines/bladerunner/script/ai/sadik.cpp
engines/bladerunner/script/ai/sebastian.cpp
engines/bladerunner/script/ai/steele.cpp
engines/bladerunner/script/ai/tyrell.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 a4ad30996d..b12f25fac8 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,
- kModelAnimationSteeleWithGunStrafeFast = 55, // ??? untriggered
- kModelAnimationSteeleWithGunStrafeSlow = 56, // ??? untriggered
+ kModelAnimationSteeleWithGunStrafeFast = 55, // untriggered
+ kModelAnimationSteeleWithGunStrafeSlow = 56, // untriggered
kModelAnimationSteeleWithGunGotHitRight = 57,
kModelAnimationSteeleWithGunGotHitLeft = 58,
kModelAnimationSteeleWithGunWalking = 59,
@@ -1940,7 +1940,7 @@ enum GameModelAnimations {
kModelAnimationClovisKneelingToStanding = 240,
kModelAnimationClovisKneelingTalking = 241,
kModelAnimationClovisJumpingDodging = 242, // animation mode 20 (TODO: Where is this used in game? In the Moonbus massacre scenario?)
- kModelAnimationClovisLayingWithBookIdle = 243, //
+ kModelAnimationClovisLayingWithBookIdle = 243,
kModelAnimationClovisLayingWithBookStopsReadingTalk = 244,
kModelAnimationClovisLayingWithBookStillReadingTalk = 245,
kModelAnimationClovisLayingWithBookGotHitOrSmallCough = 246, // UNUSED
@@ -1951,6 +1951,30 @@ enum GameModelAnimations {
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
+ kModelAnimationLucyWalking = 253,
+ kModelAnimationLucyRunning = 254,
+ kModelAnimationLucyClimbStairsUp = 255,
+ kModelAnimationLucyClimbStairsDown = 256,
+ kModelAnimationLucyGotHitBendsForward = 257,
+ kModelAnimationLucyGotHitBendsBackward = 258,
+ kModelAnimationLucyShotDead = 259,
+ kModelAnimationLucyIdle = 260,
+ kModelAnimationLucyPlayingArcade = 261, // UNUSED
+ kModelAnimationLucyGestureGive = 262, // UNUSED
+ kModelAnimationLucyCalmShortRightwardsNodTalk = 263,
+ kModelAnimationLucyComplainingTalk = 264,
+ kModelAnimationLucyIntenseTalk = 265,
+ kModelAnimationLucyPointingTalk = 266,
+ kModelAnimationLucySelfPointingTalk = 267,
+ kModelAnimationLucyVeryUpsetTalk = 268,
+ kModelAnimationLucyCalmLongRightwardsNodTalk = 269,
+ kModelAnimationLucySubtleThrowKissTalk = 270,
+ kModelAnimationLucyHappyHopTalk = 271,
+ kModelAnimationLucyCombatIdle = 272,
+ kModelAnimationLucyCombatBlocksUp = 273, // Untriggered. Could potentially be used as "attacks up" too
+ kModelAnimationLucyCombatResumeNonCombat = 274, // Untriggered
+ kModelAnimationLucyCombatDropsDead = 275, // Untriggered. Somewhat faster than kModelAnimationLucyShotDead (259)
+ kModelAnimationLucyRemovesNeckletDiesFromExplosion = 276, // Untriggered
// 277 - 311: Izo animations
// 312 - 345: Sadik animations
// 316 - 359: Twins/Luther animations
diff --git a/engines/bladerunner/script/ai/bullet_bob.cpp b/engines/bladerunner/script/ai/bullet_bob.cpp
index 0546dab09e..34d0ebbd03 100644
--- a/engines/bladerunner/script/ai/bullet_bob.cpp
+++ b/engines/bladerunner/script/ai/bullet_bob.cpp
@@ -240,7 +240,7 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
_var2 = Random_Query(3, 7);
_var4 = Random_Query(0, 4);
}
- if (!_animationFrame) {
+ if (_animationFrame == 0) {
_var1 = Random_Query(0, 1);
}
}
@@ -438,6 +438,7 @@ bool AIScriptBulletBob::ChangeAnimationMode(int mode) {
switch (mode) {
case kAnimationModeIdle:
if (_animationState > 4 || _animationState) {
+ // TODO "|| _animationState" part of the clause does not make sense (makes the first part redundant). A bug?
_animationState = 0;
_animationFrame = 0;
}
@@ -454,7 +455,7 @@ bool AIScriptBulletBob::ChangeAnimationMode(int mode) {
break;
case kAnimationModeCombatIdle:
- if (_animationState <= 4 && !_animationState) {
+ if (_animationState <= 4 && _animationState == 0) {
_animationState = 14;
_animationFrame = 0;
}
diff --git a/engines/bladerunner/script/ai/chew.cpp b/engines/bladerunner/script/ai/chew.cpp
index b8bc9e2dac..888c4a63b3 100644
--- a/engines/bladerunner/script/ai/chew.cpp
+++ b/engines/bladerunner/script/ai/chew.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptChew::AIScriptChew(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_var1 = 0;
_var2 = 0;
_var3 = 1;
@@ -37,7 +37,7 @@ void AIScriptChew::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_var1 = 0;
_var2 = 0;
_var3 = 1;
@@ -183,7 +183,7 @@ bool AIScriptChew::UpdateAnimation(int *animation, int *frame) {
case 2:
*animation = 780;
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 777;
_animationState = 0;
_var2 = 0;
@@ -323,7 +323,7 @@ bool AIScriptChew::ChangeAnimationMode(int mode) {
case 7:
case 8:
case 9:
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
default:
_animationState = 0;
@@ -340,10 +340,10 @@ bool AIScriptChew::ChangeAnimationMode(int mode) {
case 3:
if (_animationState < 2 || _animationState > 9) {
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 2;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationStateNext = 2;
_animationNext = 780;
@@ -354,10 +354,10 @@ bool AIScriptChew::ChangeAnimationMode(int mode) {
case 12:
if (_animationState < 2 || _animationState > 9) {
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 3;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationStateNext = 3;
_animationNext = 781;
@@ -368,10 +368,10 @@ bool AIScriptChew::ChangeAnimationMode(int mode) {
case 13:
if (_animationState < 2 || _animationState > 9) {
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 4;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationStateNext = 4;
_animationNext = 782;
@@ -382,10 +382,10 @@ bool AIScriptChew::ChangeAnimationMode(int mode) {
case 14:
if (_animationState < 2 || _animationState > 9) {
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 5;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationStateNext = 5;
_animationNext = 783;
@@ -396,10 +396,10 @@ bool AIScriptChew::ChangeAnimationMode(int mode) {
case 15:
if (_animationState < 2 || _animationState > 9) {
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 6;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationStateNext = 6;
_animationNext = 784;
@@ -410,10 +410,10 @@ bool AIScriptChew::ChangeAnimationMode(int mode) {
case 16:
if (_animationState < 2 || _animationState > 9) {
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 7;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationStateNext = 7;
_animationNext = 785;
@@ -424,10 +424,10 @@ bool AIScriptChew::ChangeAnimationMode(int mode) {
case 17:
if (_animationState < 2 || _animationState > 9) {
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 8;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationStateNext = 8;
_animationNext = 786;
@@ -438,10 +438,10 @@ bool AIScriptChew::ChangeAnimationMode(int mode) {
case 18:
if (_animationState < 2 || _animationState > 9) {
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 9;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationStateNext = 9;
_animationNext = 787;
@@ -451,7 +451,7 @@ bool AIScriptChew::ChangeAnimationMode(int mode) {
break;
case 43:
- if (_animationState || (!_animationState && _var2 != 1 && _var2 != 2)) {
+ if (_animationState > 0 || (_animationState == 0 && _var2 != 1 && _var2 != 2)) {
Actor_Change_Animation_Mode(kActorChew, kAnimationModeIdle);
_var2 = Random_Query(1, 2);
}
diff --git a/engines/bladerunner/script/ai/clovis.cpp b/engines/bladerunner/script/ai/clovis.cpp
index 8fe2964984..e00323fc86 100644
--- a/engines/bladerunner/script/ai/clovis.cpp
+++ b/engines/bladerunner/script/ai/clovis.cpp
@@ -30,7 +30,7 @@ AIScriptClovis::AIScriptClovis(BladeRunnerEngine *vm) : AIScriptBase(vm) {
_var3 = 1;
_var4 = 0;
_var5 = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptClovis::Initialize() {
@@ -44,7 +44,7 @@ void AIScriptClovis::Initialize() {
_var3 = 1;
_var4 = 0;
_var5 = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Set_Goal_Number(kActorClovis, kGoalClovisDefault);
}
@@ -617,7 +617,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
_animationFrame = Slice_Animation_Query_Number_Of_Frames(kModelAnimationClovisLookingUpAndAbout) - 1;
}
}
- if (!_animationFrame) {
+ if (_animationFrame == 0) {
if (Random_Query(0, 1) > 0) {
_var1 = 1;
} else {
@@ -716,7 +716,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
case 5:
*animation = kModelAnimationClovisCalmTalk;
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
_animationState = 0;
} else {
++_animationFrame;
@@ -788,7 +788,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
case 12:
*animation = kModelAnimationClovisKneelingTalking;
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
_animationState = 2;
_animationFrame = 0;
Actor_Change_Animation_Mode(kActorClovis, kAnimationModeSit);
@@ -1143,9 +1143,7 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
case 33:
*animation = kModelAnimationClovisLayingWithBookStopsReadingTalk;
- if (_animationFrame == 0
- && _flag
- ) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
_animationState = 32;
_animationFrame = 0;
Actor_Change_Animation_Mode(kActorClovis, 54);
@@ -1274,10 +1272,10 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
case 9:
case 10:
case 11:
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 12:
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 13:
_animationState = 15;
@@ -1311,7 +1309,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
_animationState = 1;
_animationStateNext = 5;
_animationNext = kModelAnimationClovisCalmTalk;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
}
break;
@@ -1357,7 +1355,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
_animationState = 1;
_animationStateNext = 6;
_animationNext = kModelAnimationClovisSuggestingTalk;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1367,7 +1365,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
_animationState = 1;
_animationStateNext = 8;
_animationNext = kModelAnimationClovisAffirmingTalk;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1376,7 +1374,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
_animationState = 1;
_animationStateNext = 7;
_animationNext = kModelAnimationClovisSuggestingAndBeardScratchTalk;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1385,7 +1383,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
_animationState = 1;
_animationStateNext = 9;
_animationNext = kModelAnimationClovisHandCircularMoveTalk;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1394,7 +1392,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
_animationState = 1;
_animationStateNext = 10;
_animationNext = kModelAnimationClovisPointingTalk;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1403,7 +1401,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
_animationState = 1;
_animationStateNext = 11;
_animationNext = kModelAnimationClovisNegotiatingTalk;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1452,7 +1450,7 @@ bool AIScriptClovis::ChangeAnimationMode(int mode) {
case 30:
_animationState = 12;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 88:
@@ -1575,10 +1573,10 @@ void AIScriptClovis::someAnim() {
case 9:
case 10:
case 11:
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 12:
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 13:
_animationState = 15;
diff --git a/engines/bladerunner/script/ai/crazylegs.cpp b/engines/bladerunner/script/ai/crazylegs.cpp
index 0a8a54ce0a..3c88648820 100644
--- a/engines/bladerunner/script/ai/crazylegs.cpp
+++ b/engines/bladerunner/script/ai/crazylegs.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptCrazylegs::AIScriptCrazylegs(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptCrazylegs::Initialize() {
@@ -34,7 +34,7 @@ void AIScriptCrazylegs::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
World_Waypoint_Set(360, kSetHF05, -103.0f, 40.63f, -53.0f);
Actor_Put_In_Set(kActorCrazylegs, kSetHF05);
@@ -186,10 +186,10 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
break;
case 6:
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 454;
_animationState = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
*animation = 458;
++_animationFrame;
@@ -279,10 +279,10 @@ bool AIScriptCrazylegs::UpdateAnimation(int *animation, int *frame) {
break;
case 15:
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
Actor_Change_Animation_Mode(kActorCrazylegs, 43);
_animationState = 2;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
*animation = 456;
} else {
*animation = 456;
@@ -373,7 +373,7 @@ bool AIScriptCrazylegs::ChangeAnimationMode(int mode) {
case 13:
case 14:
case 15:
- _flag = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
default:
break;
@@ -390,47 +390,47 @@ bool AIScriptCrazylegs::ChangeAnimationMode(int mode) {
_animationState = 6;
}
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 12:
_animationState = 7;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 8;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
_animationState = 9;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
_animationState = 10;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 16:
_animationState = 11;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 17:
_animationState = 12;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 18:
_animationState = 13;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 19:
_animationState = 14;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 23:
_animationState = 3;
diff --git a/engines/bladerunner/script/ai/dektora.cpp b/engines/bladerunner/script/ai/dektora.cpp
index 3c290fe118..0220782121 100644
--- a/engines/bladerunner/script/ai/dektora.cpp
+++ b/engines/bladerunner/script/ai/dektora.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptDektora::AIScriptDektora(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_x = _y = _z = 0.0f;
}
@@ -35,7 +35,7 @@ void AIScriptDektora::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_x = _y = _z = 0.0f;
Actor_Set_Goal_Number(kActorDektora, kGoalDektoraDefault);
@@ -612,9 +612,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
case 2:
*animation = kModelAnimationDektoraStandingNodShort;
- if (_animationFrame == 0
- && _flag
- ) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = kModelAnimationDektoraStandingIdle;
_animationState = 0;
} else {
@@ -898,7 +896,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
case 27:
*animation = kModelAnimationDektoraSittingSubtleTalking;
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = kModelAnimationDektoraSittingIdle;
_animationState = 25;
} else {
@@ -1158,7 +1156,7 @@ bool AIScriptDektora::ChangeAnimationMode(int mode) {
case 8:
case 27:
case 28:
- _flag = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 9:
case 10:
@@ -1215,7 +1213,7 @@ bool AIScriptDektora::ChangeAnimationMode(int mode) {
) {
_animationState = 2;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1275,7 +1273,7 @@ bool AIScriptDektora::ChangeAnimationMode(int mode) {
) {
_animationState = 3;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1285,7 +1283,7 @@ bool AIScriptDektora::ChangeAnimationMode(int mode) {
) {
_animationState = 4;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1295,7 +1293,7 @@ bool AIScriptDektora::ChangeAnimationMode(int mode) {
) {
_animationState = 5;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1305,7 +1303,7 @@ bool AIScriptDektora::ChangeAnimationMode(int mode) {
) {
_animationState = 6;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1315,7 +1313,7 @@ bool AIScriptDektora::ChangeAnimationMode(int mode) {
) {
_animationState = 7;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1325,7 +1323,7 @@ bool AIScriptDektora::ChangeAnimationMode(int mode) {
) {
_animationState = 8;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1374,7 +1372,7 @@ bool AIScriptDektora::ChangeAnimationMode(int mode) {
) {
_animationState = 27;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1384,7 +1382,7 @@ bool AIScriptDektora::ChangeAnimationMode(int mode) {
) {
_animationState = 28;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1418,7 +1416,7 @@ bool AIScriptDektora::ChangeAnimationMode(int mode) {
break;
case 27:
case 28:
- _flag = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
default:
_animationState = 25;
diff --git a/engines/bladerunner/script/ai/desk_clerk.cpp b/engines/bladerunner/script/ai/desk_clerk.cpp
index f48321b688..2f8b21af68 100644
--- a/engines/bladerunner/script/ai/desk_clerk.cpp
+++ b/engines/bladerunner/script/ai/desk_clerk.cpp
@@ -26,7 +26,7 @@ namespace BladeRunner {
AIScriptDeskClerk::AIScriptDeskClerk(BladeRunnerEngine *vm) : AIScriptBase(vm) {
_flag1 = false;
- _flag2 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_var3 = 75;
}
@@ -37,7 +37,7 @@ void AIScriptDeskClerk::Initialize() {
_animationNext = 0;
_flag1 = false;
- _flag2 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_var3 = 75;
Actor_Set_Goal_Number(kActorDeskClerk, kGoalDeskClerkDefault);
}
@@ -199,9 +199,7 @@ bool AIScriptDeskClerk::UpdateAnimation(int *animation, int *frame) {
case 1:
*animation = 663;
- if (_animationFrame == 0
- && _flag2
- ) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 661;
_animationState = 0;
_flag1 = false;
@@ -264,9 +262,7 @@ bool AIScriptDeskClerk::UpdateAnimation(int *animation, int *frame) {
case 7:
*animation = 669;
- if (_animationFrame == 0
- && _flag2
- ) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
Actor_Change_Animation_Mode(kActorDeskClerk, 72);
*animation = 668;
_animationState = 6;
@@ -310,7 +306,7 @@ bool AIScriptDeskClerk::ChangeAnimationMode(int mode) {
case 3:
case 4:
case 5:
- _flag2 = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 6:
@@ -329,31 +325,31 @@ bool AIScriptDeskClerk::ChangeAnimationMode(int mode) {
case kAnimationModeTalk:
_animationState = 1;
_animationFrame = 0;
- _flag2 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 12:
_animationState = 2;
_animationFrame = 0;
- _flag2 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 3;
_animationFrame = 0;
- _flag2 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
_animationState = 4;
_animationFrame = 0;
- _flag2 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
_animationState = 5;
_animationFrame = 0;
- _flag2 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 26:
@@ -364,7 +360,7 @@ bool AIScriptDeskClerk::ChangeAnimationMode(int mode) {
case 58:
_animationState = 7;
_animationFrame = 0;
- _flag2 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 72:
diff --git a/engines/bladerunner/script/ai/early_q.cpp b/engines/bladerunner/script/ai/early_q.cpp
index 0c09299918..dd10663fc3 100644
--- a/engines/bladerunner/script/ai/early_q.cpp
+++ b/engines/bladerunner/script/ai/early_q.cpp
@@ -28,7 +28,7 @@ AIScriptEarlyQ::AIScriptEarlyQ(BladeRunnerEngine *vm) : AIScriptBase(vm) {
_var1 = 0;
_var2 = 0;
_var3 = 1;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptEarlyQ::Initialize() {
@@ -40,7 +40,7 @@ void AIScriptEarlyQ::Initialize() {
_var1 = 0;
_var2 = 0;
_var3 = 1;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
bool AIScriptEarlyQ::Update() {
@@ -521,12 +521,12 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
_animationFrame = Slice_Animation_Query_Number_Of_Frames(369) - 1;
}
_var1 = Random_Query(0, 1);
- if (!_animationFrame) {
+ if (_animationFrame == 0) {
if (!Random_Query(0, 3)) {
_var2 = 1;
}
}
- if (!_animationFrame || _animationFrame == 5) {
+ if (_animationFrame == 0 || _animationFrame == 5) {
if (Random_Query(0, 1)) {
_var1 = Random_Query(2, 8);
}
@@ -621,8 +621,8 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
case 10:
*animation = 385;
- if (!_animationFrame && _flag) {
- _flag = 0;
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationState = 9;
_var2 = 0;
*animation = 384;
@@ -742,10 +742,10 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
case 20:
*animation = 372;
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 369;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationState = 0;
} else {
++_animationFrame;
@@ -869,7 +869,7 @@ bool AIScriptEarlyQ::ChangeAnimationMode(int mode) {
case 26:
case 27:
case 28:
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 12:
@@ -897,7 +897,7 @@ bool AIScriptEarlyQ::ChangeAnimationMode(int mode) {
case kAnimationModeTalk:
_animationState = 20;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case kAnimationModeCombatIdle:
@@ -925,49 +925,49 @@ bool AIScriptEarlyQ::ChangeAnimationMode(int mode) {
case 12:
_animationState = 21;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 22;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
_animationState = 23;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
_animationState = 24;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 16:
_animationState = 25;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 17:
_animationState = 26;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 18:
_animationState = 27;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 19:
_animationState = 28;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case kAnimationModeHit:
@@ -1006,7 +1006,7 @@ bool AIScriptEarlyQ::ChangeAnimationMode(int mode) {
case 30:
_animationState = 10;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case kAnimationModeDie:
diff --git a/engines/bladerunner/script/ai/early_q_bartender.cpp b/engines/bladerunner/script/ai/early_q_bartender.cpp
index 0ace629079..c55d6e7577 100644
--- a/engines/bladerunner/script/ai/early_q_bartender.cpp
+++ b/engines/bladerunner/script/ai/early_q_bartender.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptEarlyQBartender::AIScriptEarlyQBartender(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_var1 = 0;
_var2 = 1;
}
@@ -36,7 +36,7 @@ void AIScriptEarlyQBartender::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_var1 = 0;
_var2 = 1;
@@ -133,7 +133,7 @@ bool AIScriptEarlyQBartender::UpdateAnimation(int *animation, int *frame) {
case 1:
*animation = 755;
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
_animationState = 0;
_var1 = 0;
} else {
@@ -195,19 +195,19 @@ bool AIScriptEarlyQBartender::ChangeAnimationMode(int mode) {
case 3:
_animationState = 1;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 12:
_animationState = 2;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 3;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 23:
diff --git a/engines/bladerunner/script/ai/fish_dealer.cpp b/engines/bladerunner/script/ai/fish_dealer.cpp
index 4ab1deb13c..680f09a276 100644
--- a/engines/bladerunner/script/ai/fish_dealer.cpp
+++ b/engines/bladerunner/script/ai/fish_dealer.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptFishDealer::AIScriptFishDealer(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptFishDealer::Initialize() {
@@ -34,7 +34,7 @@ void AIScriptFishDealer::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Put_In_Set(kActorFishDealer, kSetAR01_AR02);
Actor_Set_At_Waypoint(kActorFishDealer, 120, 424);
Actor_Set_Goal_Number(kActorFishDealer, 0);
@@ -202,10 +202,10 @@ bool AIScriptFishDealer::UpdateAnimation(int *animation, int *frame) {
break;
case 1:
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 683;
_animationState = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
*animation = 685;
++_animationFrame;
@@ -271,7 +271,7 @@ bool AIScriptFishDealer::ChangeAnimationMode(int mode) {
_animationState = 0;
_animationFrame = 0;
} else {
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
}
break;
diff --git a/engines/bladerunner/script/ai/general_doll.cpp b/engines/bladerunner/script/ai/general_doll.cpp
index cd788bee10..ba2919ca52 100644
--- a/engines/bladerunner/script/ai/general_doll.cpp
+++ b/engines/bladerunner/script/ai/general_doll.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptGeneralDoll::AIScriptGeneralDoll(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptGeneralDoll::Initialize() {
@@ -34,7 +34,7 @@ void AIScriptGeneralDoll::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Put_In_Set(kActorGeneralDoll, kSetFreeSlotG);
Actor_Set_At_Waypoint(kActorGeneralDoll, 39, 0);
@@ -295,7 +295,7 @@ bool AIScriptGeneralDoll::UpdateAnimation(int *animation, int *frame) {
case 1:
*animation = 835;
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 834;
_animationFrame = 0;
_animationState = 0;
@@ -344,7 +344,7 @@ bool AIScriptGeneralDoll::ChangeAnimationMode(int mode) {
switch (mode) {
case 0:
if (_animationState == 1) {
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
} else {
_animationState = 0;
_animationFrame = 0;
@@ -358,7 +358,7 @@ bool AIScriptGeneralDoll::ChangeAnimationMode(int mode) {
case 3:
_animationState = 1;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 43:
diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp
index a5ef16bfad..dde5e9ecaf 100644
--- a/engines/bladerunner/script/ai/gordo.cpp
+++ b/engines/bladerunner/script/ai/gordo.cpp
@@ -24,7 +24,7 @@
namespace BladeRunner {
AIScriptGordo::AIScriptGordo(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- var_45B078 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_counter = 0;
_counterTarget = 0;
_frameMin = 0;
@@ -37,7 +37,7 @@ void AIScriptGordo::Initialize() {
_animationState = 0;
_animationFrame = 0;
_animationStateNext = 0;
- var_45B078 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_counter = 0;
_counterTarget = 0;
_frameMin = 0;
@@ -863,7 +863,7 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
case 4:
*animation = kModelAnimationGordoIdleTalk;
- if (_animationFrame == 0 && var_45B078) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = kModelAnimationGordoIdle;
_animationState = 0;
} else {
@@ -1177,7 +1177,8 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
break;
case 36:
- if (_animationFrame == 0 && var_45B078) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
+ // TODO use of _resumeIdleAfterFramesetCompletesFlag here, means change to another animation after this one completed)
Actor_Change_Animation_Mode(kActorGordo, 80);
*animation = kModelAnimationGordoWithGunWithHostageATalk;
_animationState = 35;
@@ -1191,7 +1192,8 @@ bool AIScriptGordo::UpdateAnimation(int *animation, int *frame) {
break;
case 37:
- if (_animationFrame == 0 && var_45B078) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
+ // TODO use of _resumeIdleAfterFramesetCompletesFlag here, means change to another animation after this one completed)
Actor_Change_Animation_Mode(kActorGordo, 80);
*animation = kModelAnimationGordoWithGunWithHostageATalk;
_animationState = 35;
@@ -1259,7 +1261,7 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
case 12:
case 36:
case 37:
- var_45B078 = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
default:
_animationState = 0;
@@ -1281,7 +1283,7 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
break;
case kAnimationModeTalk:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 4;
_animationFrame = 0;
} else {
@@ -1289,7 +1291,7 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
_animationStateNext = 4;
_animationNext = kModelAnimationGordoIdleTalk;
}
- var_45B078 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case kAnimationModeCombatIdle:
@@ -1332,7 +1334,7 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
break;
case 12:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 5;
_animationFrame = 0;
} else {
@@ -1340,11 +1342,11 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
_animationStateNext = 5;
_animationNext = kModelAnimationGordoSuggestingTalk;
}
- var_45B078 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 6;
_animationFrame = 0;
} else {
@@ -1352,11 +1354,11 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
_animationStateNext = 6;
_animationNext = kModelAnimationGordoSuggestAndPointTalk;
}
- var_45B078 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 7;
_animationFrame = 0;
} else {
@@ -1364,11 +1366,11 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
_animationStateNext = 7;
_animationNext = kModelAnimationGordoSuggestAndDismissTalk;
}
- var_45B078 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 8;
_animationFrame = 0;
} else {
@@ -1376,11 +1378,11 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
_animationStateNext = 8;
_animationNext = kModelAnimationGordoDismissiveTalk;
}
- var_45B078 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 16:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 9;
_animationFrame = 0;
} else {
@@ -1388,11 +1390,11 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
_animationStateNext = 9;
_animationNext = kModelAnimationGordoUpsetTalk;
}
- var_45B078 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 17:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 10;
_animationFrame = 0;
} else {
@@ -1400,11 +1402,11 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
_animationStateNext = 10;
_animationNext = kModelAnimationGordoExplainAndPointTalk;
}
- var_45B078 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 18:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 11;
_animationFrame = 0;
} else {
@@ -1412,11 +1414,11 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
_animationStateNext = 11;
_animationNext = kModelAnimationGordoAdjustBowtieTalk;
}
- var_45B078 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 19:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 12;
_animationFrame = 0;
} else {
@@ -1424,7 +1426,7 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
_animationStateNext = 12;
_animationNext = kModelAnimationGordoAdjustBowtieTalk;
}
- var_45B078 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case kAnimationModeHit:
@@ -1543,13 +1545,13 @@ bool AIScriptGordo::ChangeAnimationMode(int mode) {
case 81:
_animationState = 36;
_animationFrame = 0;
- var_45B078 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 82:
_animationState = 37;
_animationFrame = 0;
- var_45B078 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 83:
@@ -1895,7 +1897,7 @@ void AIScriptGordo::unknown() {
Actor_Change_Animation_Mode(kActorGordo, 53);
break;
default:
- var_45B078 = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
}
}
diff --git a/engines/bladerunner/script/ai/guzza.cpp b/engines/bladerunner/script/ai/guzza.cpp
index c962721adf..9ea7e5bf39 100644
--- a/engines/bladerunner/script/ai/guzza.cpp
+++ b/engines/bladerunner/script/ai/guzza.cpp
@@ -28,7 +28,7 @@ AIScriptGuzza::AIScriptGuzza(BladeRunnerEngine *vm) : AIScriptBase(vm) {
_frameDelta = 0;
_counter = 0;
_state = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptGuzza::Initialize() {
@@ -39,7 +39,7 @@ void AIScriptGuzza::Initialize() {
_frameDelta = 1;
_counter = 0;
_state = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
#if BLADERUNNER_ORIGINAL_BUGS
// Guzza begins with -1 as a goal number in the original, it is unset until Act 2
#else
@@ -510,10 +510,10 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
break;
case 11:
- if (_animationFrame == 0 && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = kModelAnimationGuzzaStandIdle;
_animationState = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_state = 0;
_counter = 0;
_frameDelta = 1;
@@ -577,10 +577,10 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
break;
case 17:
- if (_animationFrame == 0 && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = kModelAnimationGuzzaSitAndTalkOrChew;
_animationState = 1;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Change_Animation_Mode(kActorGuzza, 53);
_state = 0;
_counter = 0;
@@ -635,10 +635,10 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
break;
case 22:
- if (_animationFrame == 0 && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = kModelAnimationGuzzaWithGunIdle;
_animationState = 24;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Change_Animation_Mode(kActorGuzza, kAnimationModeCombatIdle);
_state = 0;
_counter = 0;
@@ -653,10 +653,10 @@ bool AIScriptGuzza::UpdateAnimation(int *animation, int *frame) {
break;
case 23:
- if (_animationFrame == 0 && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = kModelAnimationGuzzaWithGunIdle;
_animationState = 24;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Change_Animation_Mode(kActorGuzza, kAnimationModeCombatIdle);
_state = 0;
_counter = 0;
@@ -809,7 +809,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
case 21:
case 22:
case 23:
- _flag = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 24:
case 31:
@@ -837,10 +837,10 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
break;
case kAnimationModeTalk:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 11;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationState = 2;
_animationFrame = 0;
@@ -877,10 +877,10 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
break;
case 12:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 12;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationState = 2;
_animationFrame = 0;
@@ -890,10 +890,10 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
break;
case 13:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 13;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationState = 2;
_animationFrame = 0;
@@ -903,10 +903,10 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
break;
case 14:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 14;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationState = 2;
_animationFrame = 0;
@@ -916,10 +916,10 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
break;
case 15:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 15;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationState = 2;
_animationFrame = 0;
@@ -929,10 +929,10 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
break;
case 16:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 16;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationState = 2;
_animationFrame = 0;
@@ -963,7 +963,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
} else {
_animationState = 17;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -975,7 +975,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
} else {
_animationState = 18;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -987,7 +987,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
} else {
_animationState = 19;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -999,7 +999,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
} else {
_animationState = 20;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1011,7 +1011,7 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
} else {
_animationState = 21;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1038,13 +1038,13 @@ bool AIScriptGuzza::ChangeAnimationMode(int mode) {
case 58:
_animationState = 22;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 59:
_animationState = 23;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 61:
diff --git a/engines/bladerunner/script/ai/hanoi.cpp b/engines/bladerunner/script/ai/hanoi.cpp
index 6199a0647c..da20b3c86a 100644
--- a/engines/bladerunner/script/ai/hanoi.cpp
+++ b/engines/bladerunner/script/ai/hanoi.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptHanoi::AIScriptHanoi(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _var1 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_flag1 = 0;
_var3 = 0;
_var4 = 1;
@@ -37,7 +37,7 @@ void AIScriptHanoi::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _var1 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_flag1 = 0;
_var3 = 0;
_var4 = 1;
@@ -571,9 +571,8 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
case 14:
*animation = 650;
- if (_animationFrame == 0
- && _var1 // this is never set so it's always 0
- ) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
+ // _resumeIdleAfterFramesetCompletesFlag is never set so it's always false, thus this does not evaluate true
_animationState = 0;
} else {
++_animationFrame;
diff --git a/engines/bladerunner/script/ai/hasan.cpp b/engines/bladerunner/script/ai/hasan.cpp
index ea0fcf3bb9..28792dcb43 100644
--- a/engines/bladerunner/script/ai/hasan.cpp
+++ b/engines/bladerunner/script/ai/hasan.cpp
@@ -279,7 +279,7 @@ bool AIScriptHasan::UpdateAnimation(int *animation, int *frame) {
_var1 = Random_Query(6, 14);
_var3 = Random_Query(0, 4);
}
- if (!_animationFrame) {
+ if (_animationFrame == 0) {
_var6 = Random_Query(0, 2);
}
if (_var6 == 1 && _var4) {
diff --git a/engines/bladerunner/script/ai/hawkers_barkeep.cpp b/engines/bladerunner/script/ai/hawkers_barkeep.cpp
index f21aef9b93..69ba3b6728 100644
--- a/engines/bladerunner/script/ai/hawkers_barkeep.cpp
+++ b/engines/bladerunner/script/ai/hawkers_barkeep.cpp
@@ -28,7 +28,7 @@ AIScriptHawkersBarkeep::AIScriptHawkersBarkeep(BladeRunnerEngine *vm) : AIScript
_var1 = 0;
_var2 = 0;
_var3 = 1;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptHawkersBarkeep::Initialize() {
@@ -40,7 +40,7 @@ void AIScriptHawkersBarkeep::Initialize() {
_var1 = 0;
_var2 = 0;
_var3 = 1;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Put_In_Set(kActorHawkersBarkeep, kSetHC01_HC02_HC03_HC04);
Actor_Set_At_XYZ(kActorHawkersBarkeep, -225.0f, 0.14f, 39.0f, 284);
@@ -144,7 +144,7 @@ bool AIScriptHawkersBarkeep::UpdateAnimation(int *animation, int *frame) {
_var2 = Random_Query(2, 8);
if (!Random_Query(0, 5)) {
- if (!_animationFrame || _animationFrame == 11) {
+ if (_animationFrame == 0 || _animationFrame == 11) {
_animationFrame = 0;
if (Random_Query(0, 1)) {
@@ -237,7 +237,7 @@ bool AIScriptHawkersBarkeep::UpdateAnimation(int *animation, int *frame) {
case 2:
*animation = 710;
- if (_animationFrame == 0 && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
_animationState = 0;
_var1 = 0;
} else {
@@ -339,7 +339,7 @@ bool AIScriptHawkersBarkeep::ChangeAnimationMode(int mode) {
switch (mode) {
case 0:
if (_animationState >= 2 && _animationState <= 7) {
- _flag = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
} else {
_animationState = 0;
_animationFrame = 0;
@@ -347,7 +347,7 @@ bool AIScriptHawkersBarkeep::ChangeAnimationMode(int mode) {
break;
case 3:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 2;
_animationFrame = 0;
} else {
@@ -355,11 +355,11 @@ bool AIScriptHawkersBarkeep::ChangeAnimationMode(int mode) {
_animationStateNext = 2;
_animationNext = 710;
}
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 12:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 2;
_animationFrame = 0;
} else {
@@ -367,11 +367,11 @@ bool AIScriptHawkersBarkeep::ChangeAnimationMode(int mode) {
_animationStateNext = 3;
_animationNext = 711;
}
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 2;
_animationFrame = 0;
} else {
@@ -379,11 +379,11 @@ bool AIScriptHawkersBarkeep::ChangeAnimationMode(int mode) {
_animationStateNext = 4;
_animationNext = 712;
}
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 2;
_animationFrame = 0;
} else {
@@ -391,11 +391,11 @@ bool AIScriptHawkersBarkeep::ChangeAnimationMode(int mode) {
_animationStateNext = 5;
_animationNext = 713;
}
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 2;
_animationFrame = 0;
} else {
@@ -403,11 +403,11 @@ bool AIScriptHawkersBarkeep::ChangeAnimationMode(int mode) {
_animationStateNext = 6;
_animationNext = 714;
}
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 16:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 2;
_animationFrame = 0;
} else {
@@ -415,7 +415,7 @@ bool AIScriptHawkersBarkeep::ChangeAnimationMode(int mode) {
_animationStateNext = 7;
_animationNext = 715;
}
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
default:
diff --git a/engines/bladerunner/script/ai/holloway.cpp b/engines/bladerunner/script/ai/holloway.cpp
index b23ca9b3f3..33fd90328c 100644
--- a/engines/bladerunner/script/ai/holloway.cpp
+++ b/engines/bladerunner/script/ai/holloway.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptHolloway::AIScriptHolloway(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptHolloway::Initialize() {
@@ -34,7 +34,7 @@ void AIScriptHolloway::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Set_Goal_Number(kActorHolloway, kGoalHollowayDefault);
}
@@ -235,9 +235,7 @@ bool AIScriptHolloway::UpdateAnimation(int *animation, int *frame) {
break;
case 2:
- if (_animationFrame == 0
- && _flag
- ) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 717;
_animationState = 0;
} else {
@@ -312,7 +310,7 @@ bool AIScriptHolloway::ChangeAnimationMode(int mode) {
_animationState = 0;
_animationFrame = 0;
} else {
- _flag = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
}
break;
@@ -324,7 +322,7 @@ bool AIScriptHolloway::ChangeAnimationMode(int mode) {
case kAnimationModeTalk:
_animationState = 2;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case kAnimationModeCombatAttack:
@@ -335,25 +333,25 @@ bool AIScriptHolloway::ChangeAnimationMode(int mode) {
case 12:
_animationState = 3;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 4;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
_animationState = 5;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
_animationState = 6;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
default:
diff --git a/engines/bladerunner/script/ai/insect_dealer.cpp b/engines/bladerunner/script/ai/insect_dealer.cpp
index 606075b085..9799171e05 100644
--- a/engines/bladerunner/script/ai/insect_dealer.cpp
+++ b/engines/bladerunner/script/ai/insect_dealer.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptInsectDealer::AIScriptInsectDealer(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_state = 0;
_frameDelta = 0;
_var2 = 0;
@@ -38,7 +38,7 @@ void AIScriptInsectDealer::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_state = 0;
_frameDelta = 1;
_var2 = 6;
@@ -174,7 +174,7 @@ bool AIScriptInsectDealer::UpdateAnimation(int *animation, int *frame) {
}
break;
case 1:
- if (_animationFrame == 0 && _flag1) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 545;
_animationState = 0;
} else {
@@ -259,7 +259,7 @@ bool AIScriptInsectDealer::ChangeAnimationMode(int mode) {
switch (mode) {
case 0:
if (_animationState > 0 && _animationState <= 7) {
- _flag1 = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
} else {
_animationState = 0;
_animationFrame = 0;
@@ -270,37 +270,37 @@ bool AIScriptInsectDealer::ChangeAnimationMode(int mode) {
case 19:
_animationState = 1;
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 12:
_animationState = 2;
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 3;
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
_animationState = 4;
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
_animationState = 5;
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 16:
_animationState = 6;
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 17:
_animationState = 7;
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 23:
_animationState = 8;
diff --git a/engines/bladerunner/script/ai/isabella.cpp b/engines/bladerunner/script/ai/isabella.cpp
index 6026dcf295..4cf02fecdf 100644
--- a/engines/bladerunner/script/ai/isabella.cpp
+++ b/engines/bladerunner/script/ai/isabella.cpp
@@ -113,7 +113,7 @@ bool AIScriptIsabella::UpdateAnimation(int *animation, int *frame) {
if (_animationFrame < 0) {
_animationFrame = Slice_Animation_Query_Number_Of_Frames(839) - 1;
}
- if (!_animationFrame) {
+ if (_animationFrame == 0) {
_var3 = 0;
_var4 = 2 * Random_Query(0, 1) - 1;
}
@@ -147,7 +147,7 @@ bool AIScriptIsabella::UpdateAnimation(int *animation, int *frame) {
_var2 = Random_Query(4, 8);
}
}
- if (!_animationFrame) {
+ if (_animationFrame == 0) {
if (!Random_Query(0, 2)) {
_var3 = 1;
}
@@ -190,7 +190,7 @@ bool AIScriptIsabella::UpdateAnimation(int *animation, int *frame) {
_animationFrame = Slice_Animation_Query_Number_Of_Frames(841) - 1;
}
}
- if (!_animationFrame) {
+ if (_animationFrame == 0) {
_animationState = Random_Query(2, 3);
}
}
@@ -210,7 +210,7 @@ bool AIScriptIsabella::UpdateAnimation(int *animation, int *frame) {
_animationFrame = Slice_Animation_Query_Number_Of_Frames(842) - 1;
}
}
- if (!_animationFrame) {
+ if (_animationFrame == 0) {
*animation = 841;
_animationState = 2;
}
diff --git a/engines/bladerunner/script/ai/izo.cpp b/engines/bladerunner/script/ai/izo.cpp
index 89e8bc3b53..99e56b118c 100644
--- a/engines/bladerunner/script/ai/izo.cpp
+++ b/engines/bladerunner/script/ai/izo.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptIzo::AIScriptIzo(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_var1 = 6;
_var2 = 1;
_var3 = 0;
@@ -38,7 +38,7 @@ void AIScriptIzo::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_var1 = 6;
_var2 = 1;
_var3 = 0;
@@ -557,11 +557,11 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
break;
case 1:
- if (_animationFrame <= 2 && _flag) {
+ if (_animationFrame <= 2 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 297;
_animationFrame = 0;
_animationState = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
*animation = 299;
++_animationFrame;
@@ -780,16 +780,16 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
break;
case 33:
- *animation = 310;
- if (_animationFrame || !_flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
+ _resumeIdleAfterFramesetCompletesFlag = false;
+ _animationState = 31;
+ *animation = 308;
+ } else {
+ *animation = 310;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(310)) {
_animationFrame = 0;
}
- } else {
- _flag = 0;
- _animationState = 31;
- *animation = 308;
}
break;
@@ -858,7 +858,7 @@ bool AIScriptIzo::ChangeAnimationMode(int mode) {
case 6:
case 7:
case 33:
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 8:
@@ -905,12 +905,12 @@ bool AIScriptIzo::ChangeAnimationMode(int mode) {
_animationStateNext = 1;
_animationNext = 299;
}
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
return true;
case 4:
- if (_animationState) {
+ if (_animationState > 0) {
if (_animationState != 8 || _animationState > 8) {
_animationState = 8;
_animationFrame = 0;
@@ -950,7 +950,7 @@ bool AIScriptIzo::ChangeAnimationMode(int mode) {
_animationStateNext = 1;
_animationNext = 300;
}
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -962,7 +962,7 @@ bool AIScriptIzo::ChangeAnimationMode(int mode) {
_animationStateNext = 1;
_animationNext = 302;
}
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -973,7 +973,7 @@ bool AIScriptIzo::ChangeAnimationMode(int mode) {
_animationStateNext = 1;
_animationNext = 301;
}
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -984,7 +984,7 @@ bool AIScriptIzo::ChangeAnimationMode(int mode) {
_animationStateNext = 1;
_animationNext = 303;
}
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -995,7 +995,7 @@ bool AIScriptIzo::ChangeAnimationMode(int mode) {
_animationStateNext = 1;
_animationNext = 304;
}
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1006,7 +1006,7 @@ bool AIScriptIzo::ChangeAnimationMode(int mode) {
_animationStateNext = 1;
_animationNext = 305;
}
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
diff --git a/engines/bladerunner/script/ai/leon.cpp b/engines/bladerunner/script/ai/leon.cpp
index c44110a2d9..a3edee1c43 100644
--- a/engines/bladerunner/script/ai/leon.cpp
+++ b/engines/bladerunner/script/ai/leon.cpp
@@ -28,14 +28,14 @@ AIScriptLeon::AIScriptLeon(BladeRunnerEngine *vm) : AIScriptBase(vm) {
_mcCoyPositionX = 0.0f;
_mcCoyPositionY = 0.0f;
_mcCoyPositionZ = 0.0f;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptLeon::Initialize() {
_mcCoyPositionX = 0.0f;
_mcCoyPositionY = 0.0f;
_mcCoyPositionZ = 0.0f;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationStateNext = 0;
_animationNext = 0;
_animationFrame = 0;
@@ -287,9 +287,7 @@ bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
break;
case 2:
- if (_animationFrame == 0
- && _flag
- ) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 847;
_animationState = 0;
} else {
@@ -332,9 +330,7 @@ bool AIScriptLeon::UpdateAnimation(int *animation, int *frame) {
break;
case 6:
- if (_animationFrame == 0
- && _flag
- ) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
Actor_Change_Animation_Mode(kActorLeon, 72);
*animation = 848;
} else {
@@ -407,7 +403,7 @@ bool AIScriptLeon::ChangeAnimationMode(int mode) {
case 5:
case 6:
case 7:
- _flag = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 8:
Actor_Change_Animation_Mode(kActorLeon, 72);
@@ -427,7 +423,7 @@ bool AIScriptLeon::ChangeAnimationMode(int mode) {
case kAnimationModeTalk:
_animationState = 2;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case kAnimationModeCombatAttack:
@@ -438,31 +434,31 @@ bool AIScriptLeon::ChangeAnimationMode(int mode) {
case 12:
_animationState = 3;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 4;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
_animationState = 5;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
_animationState = 6;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 16:
_animationState = 7;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 26:
diff --git a/engines/bladerunner/script/ai/lucy.cpp b/engines/bladerunner/script/ai/lucy.cpp
index 8ba4862f81..bed94429c9 100644
--- a/engines/bladerunner/script/ai/lucy.cpp
+++ b/engines/bladerunner/script/ai/lucy.cpp
@@ -24,8 +24,20 @@
namespace BladeRunner {
+enum kLucyStates {
+ kLucyStateIdle = 0,
+ kLucyStateWalking = 1,
+ kLucyStateRunning = 2,
+ kLucyStateClimbStairsUp = 3,
+ kLucyStateClimbStairsDown = 4,
+ kLucyStateGotShotA = 5,
+ kLucyStateGotShotB = 6,
+ kLucyStateDie = 7
+ // TODO fill in the rest of the animationStates
+};
+
AIScriptLucy::AIScriptLucy(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptLucy::Initialize() {
@@ -34,7 +46,7 @@ void AIScriptLucy::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Set_Goal_Number(kActorLucy, kGoalLucyDefault);
}
@@ -541,29 +553,32 @@ bool AIScriptLucy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
bool AIScriptLucy::UpdateAnimation(int *animation, int *frame) {
switch (_animationState) {
- case 0:
- *animation = 260;
+ case kLucyStateIdle:
+ *animation = kModelAnimationLucyIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(260)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationLucyIdle)) {
_animationFrame = 0;
}
break;
- case 1:
- case 2:
- case 3:
- case 4:
- if (_animationState == 1) {
- *animation = 253;
+ case kLucyStateWalking:
+ // fall through
+ case kLucyStateRunning:
+ // fall through
+ case kLucyStateClimbStairsUp:
+ // fall through
+ case kLucyStateClimbStairsDown:
+ if (_animationState == kLucyStateWalking) {
+ *animation = kModelAnimationLucyWalking;
}
- if (_animationState == 2) {
- *animation = 254;
+ if (_animationState == kLucyStateRunning) {
+ *animation = kModelAnimationLucyRunning;
}
- if (_animationState == 3) {
- *animation = 255;
+ if (_animationState == kLucyStateClimbStairsUp) {
+ *animation = kModelAnimationLucyClimbStairsUp;
}
- if (_animationState == 4) {
- *animation = 256;
+ if (_animationState == kLucyStateClimbStairsDown) {
+ *animation = kModelAnimationLucyClimbStairsDown;
}
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
@@ -571,128 +586,136 @@ bool AIScriptLucy::UpdateAnimation(int *animation, int *frame) {
}
break;
- case 5:
- case 6:
- if (_animationState == 5) {
- *animation = 257;
+ case kLucyStateGotShotA:
+ // fall through
+ case kLucyStateGotShotB:
+ if (_animationState == kLucyStateGotShotA) {
+ *animation = kModelAnimationLucyGotHitBendsForward;
}
- if (_animationState == 6) {
- *animation = 258;
+ if (_animationState == kLucyStateGotShotB) {
+ *animation = kModelAnimationLucyGotHitBendsBackward;
}
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
- *animation = 260;
+ *animation = kModelAnimationLucyIdle;
_animationFrame = 0;
- _animationState = 0;
+ _animationState = kLucyStateIdle;
Actor_Change_Animation_Mode(kActorLucy, kAnimationModeIdle);
}
break;
- case 7:
- *animation = 259;
- if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(259) - 1) {
+ case kLucyStateDie:
+ *animation = kModelAnimationLucyShotDead;
+ if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(kModelAnimationLucyShotDead) - 1) {
++_animationFrame;
}
break;
case 8:
- if (!_animationFrame && _flag) {
- *animation = 260;
- _animationState = 0;
- _flag = 0;
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
+ *animation = kModelAnimationLucyIdle;
+ _animationState = kLucyStateIdle;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
- *animation = 263;
+ *animation = kModelAnimationLucyCalmShortRightwardsNodTalk;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(263)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationLucyCalmShortRightwardsNodTalk)) {
_animationFrame = 0;
}
}
break;
case 9:
+ // fall through
case 10:
+ // fall through
case 11:
+ // fall through
case 12:
+ // fall through
case 13:
+ // fall through
case 14:
+ // fall through
case 15:
+
case 16:
if (_animationState == 9) {
- *animation = 264;
+ *animation = kModelAnimationLucyComplainingTalk;
}
if (_animationState == 10) {
- *animation = 265;
+ *animation = kModelAnimationLucyIntenseTalk;
}
if (_animationState == 11) {
- *animation = 266;
+ *animation = kModelAnimationLucyPointingTalk;
}
if (_animationState == 12) {
- *animation = 267;
+ *animation = kModelAnimationLucySelfPointingTalk;
}
if (_animationState == 13) {
- *animation = 268;
+ *animation = kModelAnimationLucyVeryUpsetTalk;
}
if (_animationState == 14) {
- *animation = 269;
+ *animation = kModelAnimationLucyCalmLongRightwardsNodTalk;
}
if (_animationState == 15) {
- *animation = 270;
+ *animation = kModelAnimationLucySubtleThrowKissTalk;
}
if (_animationState == 16) {
- *animation = 271;
+ *animation = kModelAnimationLucyHappyHopTalk;
}
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
_animationFrame = 0;
_animationState = 8;
- *animation = 263;
+ *animation = kModelAnimationLucyCalmShortRightwardsNodTalk;
}
break;
case 17:
- *animation = 272;
+ *animation = kModelAnimationLucyCombatIdle;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(272)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationLucyCombatIdle)) {
_animationFrame = 0;
}
break;
case 18:
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
_animationState = 17;
- _flag = 0;
- *animation = 272;
+ _resumeIdleAfterFramesetCompletesFlag = false;
+ *animation = kModelAnimationLucyCombatIdle;
} else {
- *animation = 273;
+ *animation = kModelAnimationLucyCombatBlocksUp;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(273)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationLucyCombatBlocksUp)) {
_animationFrame = 0;
}
}
break;
case 19:
- *animation = 274;
+ *animation = kModelAnimationLucyCombatResumeNonCombat;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(274)) {
- *animation = 260;
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationLucyCombatResumeNonCombat)) {
+ *animation = kModelAnimationLucyIdle;
_animationFrame = 0;
- _animationState = 0;
+ _animationState = kLucyStateIdle;
}
break;
case 20:
- *animation = 275;
+ *animation = kModelAnimationLucyCombatDropsDead;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(275)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationLucyCombatDropsDead)) {
_animationFrame = 0;
}
break;
case 21:
- *animation = 276;
+ *animation = kModelAnimationLucyRemovesNeckletDiesFromExplosion;
++_animationFrame;
- if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(276)) {
+ if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(kModelAnimationLucyRemovesNeckletDiesFromExplosion)) {
_animationFrame = 0;
}
break;
@@ -707,118 +730,118 @@ bool AIScriptLucy::UpdateAnimation(int *animation, int *frame) {
bool AIScriptLucy::ChangeAnimationMode(int mode) {
switch (mode) {
- case 0:
- if (_animationState >= 8 && _animationState <= 16) {
- _flag = 1;
+ case kAnimationModeIdle:
+ if (_animationState >= 8 && _animationState <= 16) {
+ _resumeIdleAfterFramesetCompletesFlag = true;
} else {
- _animationState = 0;
+ _animationState = kLucyStateIdle;
_animationFrame = 0;
}
break;
- case 1:
- _animationState = 1;
+ case kAnimationModeWalk:
+ _animationState = kLucyStateWalking;
_animationFrame = 0;
break;
- case 2:
- _animationState = 2;
+ case kAnimationModeRun:
+ _animationState = kLucyStateRunning;
_animationFrame = 0;
break;
- case 3:
- _flag = 0;
+ case kAnimationModeTalk:
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationState = 8;
_animationFrame = 0;
break;
- case 4:
+ case kAnimationModeCombatIdle:
if (_animationState >= 8 && _animationState <= 16) {
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
} else {
- _animationState = 0;
+ _animationState = kLucyStateIdle;
_animationFrame = 0;
}
break;
- case 7:
- _animationState = 1;
+ case kAnimationModeCombatWalk:
+ _animationState = kLucyStateWalking;
_animationFrame = 0;
break;
- case 8:
- _animationState = 2;
+ case kAnimationModeCombatRun:
+ _animationState = kLucyStateRunning;
_animationFrame = 0;
break;
case 12:
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationState = 9;
_animationFrame = 0;
break;
case 13:
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationState = 10;
_animationFrame = 0;
break;
case 14:
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationState = 11;
_animationFrame = 0;
break;
case 15:
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationState = 12;
_animationFrame = 0;
break;
case 16:
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationState = 13;
_animationFrame = 0;
break;
case 17:
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationState = 14;
_animationFrame = 0;
break;
case 18:
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationState = 15;
_animationFrame = 0;
break;
case 19:
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationState = 16;
_animationFrame = 0;
break;
- case 21:
+ case kAnimationModeHit:
if (Random_Query(1, 2) == 1) {
- _animationState = 5;
+ _animationState = kLucyStateGotShotA;
} else {
- _animationState = 6;
+ _animationState = kLucyStateGotShotB;
}
_animationFrame = 0;
break;
- case 22:
+ case kAnimationModeCombatHit:
if (Random_Query(1, 2) == 1) {
- _animationState = 5;
+ _animationState = kLucyStateGotShotA;
} else {
- _animationState = 6;
+ _animationState = kLucyStateGotShotB;
}
_animationFrame = 0;
break;
case kAnimationModeDie:
- _animationState = 7;
+ _animationState = kLucyStateDie;
_animationFrame = 0;
break;
}
diff --git a/engines/bladerunner/script/ai/luther.cpp b/engines/bladerunner/script/ai/luther.cpp
index 11ac83f44d..2e86d8b426 100644
--- a/engines/bladerunner/script/ai/luther.cpp
+++ b/engines/bladerunner/script/ai/luther.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptLuther::AIScriptLuther(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptLuther::Initialize() {
@@ -34,7 +34,7 @@ void AIScriptLuther::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Put_In_Set(kActorLuther, kSetUG16);
Actor_Set_At_XYZ(kActorLuther, 176.91f, -40.67f, 225.92f, 486);
@@ -265,9 +265,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
break;
case 2:
- if (_animationFrame == 0
- && _flag
- ) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 346;
_animationState = 0;
} else {
@@ -391,14 +389,14 @@ bool AIScriptLuther::ChangeAnimationMode(int mode) {
_animationState = 0;
_animationFrame = 0;
} else {
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
}
break;
case 3:
_animationState = 2;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 6:
@@ -409,37 +407,37 @@ bool AIScriptLuther::ChangeAnimationMode(int mode) {
case 12:
_animationState = 3;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 4;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
_animationState = 5;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
_animationState = 6;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 16:
_animationState = 7;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 17:
_animationState = 8;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 23:
diff --git a/engines/bladerunner/script/ai/mia.cpp b/engines/bladerunner/script/ai/mia.cpp
index dc6ec68818..9664e2f6d1 100644
--- a/engines/bladerunner/script/ai/mia.cpp
+++ b/engines/bladerunner/script/ai/mia.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptMia::AIScriptMia(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptMia::Initialize() {
@@ -34,7 +34,7 @@ void AIScriptMia::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Put_In_Set(kActorMia, kSetHF01);
Actor_Set_At_XYZ(kActorMia, 606.77f, -0.01f, -214.3f, 511);
Actor_Set_Goal_Number(kActorMia, 0);
@@ -132,7 +132,7 @@ bool AIScriptMia::UpdateAnimation(int *animation, int *frame) {
case 2:
*animation = 568;
- if (!_animationFrame && _flag1) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 566;
_animationFrame = 0;
_animationState = 0;
@@ -179,7 +179,7 @@ bool AIScriptMia::ChangeAnimationMode(int mode) {
if (_animationState >= 2
&& _animationState <= 4
) {
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
_animationFrame = 0;
_animationState = 0;
@@ -188,19 +188,19 @@ bool AIScriptMia::ChangeAnimationMode(int mode) {
case kAnimationModeTalk:
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationState = 2;
break;
case 12:
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationState = 3;
break;
case 13:
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_animationState = 4;
break;
diff --git a/engines/bladerunner/script/ai/murray.cpp b/engines/bladerunner/script/ai/murray.cpp
index 7293756890..7dae758237 100644
--- a/engines/bladerunner/script/ai/murray.cpp
+++ b/engines/bladerunner/script/ai/murray.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptMurray::AIScriptMurray(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptMurray::Initialize() {
@@ -34,7 +34,7 @@ void AIScriptMurray::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Put_In_Set(kActorMurray, kSetHF01);
Actor_Set_At_XYZ(kActorMurray, 566.07f, -0.01f, -205.43f, 271);
Actor_Set_Goal_Number(kActorMurray, 0);
@@ -131,7 +131,7 @@ bool AIScriptMurray::UpdateAnimation(int *animation, int *frame) {
case 1:
*animation = 700;
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
_animationState = 0;
} else {
++_animationFrame;
@@ -203,7 +203,7 @@ bool AIScriptMurray::ChangeAnimationMode(int mode) {
switch (mode) {
case kAnimationModeIdle:
if (_animationState > 0 && _animationState <= 5) {
- _flag = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
} else {
_animationState = 0;
_animationFrame = 0;
@@ -213,31 +213,31 @@ bool AIScriptMurray::ChangeAnimationMode(int mode) {
case kAnimationModeTalk:
_animationState = 1;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 12:
_animationState = 2;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 3;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
_animationState = 4;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
_animationState = 5;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
}
diff --git a/engines/bladerunner/script/ai/mutant1.cpp b/engines/bladerunner/script/ai/mutant1.cpp
index c1db00592f..4ca1164e19 100644
--- a/engines/bladerunner/script/ai/mutant1.cpp
+++ b/engines/bladerunner/script/ai/mutant1.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptMutant1::AIScriptMutant1(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptMutant1::Initialize() {
@@ -34,7 +34,7 @@ void AIScriptMutant1::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Put_In_Set(kActorMutant1, kSetFreeSlotG);
Actor_Set_At_Waypoint(kActorMutant1, 39, 0);
@@ -417,7 +417,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
break;
case 3:
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 894;
_animationState = 0;
} else {
@@ -520,7 +520,7 @@ bool AIScriptMutant1::ChangeAnimationMode(int mode) {
switch (mode) {
case 0:
if (_animationState >= 3 && _animationState <= 5) {
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
} else {
_animationState = 0;
_animationFrame = 0;
@@ -541,12 +541,12 @@ bool AIScriptMutant1::ChangeAnimationMode(int mode) {
case 3:
_animationState = 3;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 4:
if (_animationState >= 3 && _animationState <= 5) {
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
} else {
_animationState = 0;
_animationFrame = 0;
@@ -566,13 +566,13 @@ bool AIScriptMutant1::ChangeAnimationMode(int mode) {
case 12:
_animationState = 3;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 3;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 21:
case 22:
diff --git a/engines/bladerunner/script/ai/mutant2.cpp b/engines/bladerunner/script/ai/mutant2.cpp
index 2447bf417b..54633ae3ef 100644
--- a/engines/bladerunner/script/ai/mutant2.cpp
+++ b/engines/bladerunner/script/ai/mutant2.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptMutant2::AIScriptMutant2(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_var1 = 1;
}
@@ -35,7 +35,7 @@ void AIScriptMutant2::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_var1 = 1;
Actor_Put_In_Set(kActorMutant2, kSetFreeSlotG);
@@ -390,7 +390,7 @@ bool AIScriptMutant2::UpdateAnimation(int *animation, int *frame) {
break;
case 3:
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 903;
_animationState = 0;
} else {
@@ -455,7 +455,7 @@ bool AIScriptMutant2::UpdateAnimation(int *animation, int *frame) {
_var1 = -1;
Sound_Play(kSfxHURT1M2, 100, 0, 0, 50);
} else {
- if (!_animationFrame) {
+ if (_animationFrame == 0) {
Actor_Change_Animation_Mode(kActorMutant2, kAnimationModeIdle);
}
}
@@ -473,7 +473,7 @@ bool AIScriptMutant2::ChangeAnimationMode(int mode) {
switch (mode) {
case 0:
if (_animationState >= 3 && _animationState <= 4) {
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
} else {
_animationState = 0;
_animationFrame = 0;
@@ -495,12 +495,12 @@ bool AIScriptMutant2::ChangeAnimationMode(int mode) {
case 3:
_animationState = 3;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 4:
if (_animationState >= 3 && _animationState <= 4) {
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
} else {
_animationState = 0;
_animationFrame = 0;
@@ -515,7 +515,7 @@ bool AIScriptMutant2::ChangeAnimationMode(int mode) {
case 12:
_animationState = 3;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 21:
diff --git a/engines/bladerunner/script/ai/mutant3.cpp b/engines/bladerunner/script/ai/mutant3.cpp
index a64077d592..aceddf728d 100644
--- a/engines/bladerunner/script/ai/mutant3.cpp
+++ b/engines/bladerunner/script/ai/mutant3.cpp
@@ -26,7 +26,7 @@ namespace BladeRunner {
AIScriptMutant3::AIScriptMutant3(BladeRunnerEngine *vm) : AIScriptBase(vm) {
_var1 = 1;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptMutant3::Initialize() {
@@ -36,7 +36,7 @@ void AIScriptMutant3::Initialize() {
_animationNext = 0;
_var1 = 1;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Put_In_Set(kActorMutant3, kSetFreeSlotG);
Actor_Set_At_Waypoint(kActorMutant3, 39, 0);
@@ -404,7 +404,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
break;
case 3:
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 910;
_animationState = 0;
} else {
@@ -494,7 +494,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
Sound_Play(kSfxHURT1M3, 100, 0, 0, 50);
_var1 = -1;
} else {
- if (!_animationFrame) {
+ if (_animationFrame == 0) {
Actor_Change_Animation_Mode(kActorMutant3, kAnimationModeIdle);
}
}
@@ -515,7 +515,7 @@ bool AIScriptMutant3::ChangeAnimationMode(int mode) {
switch (_animationState) {
case 3:
case 4:
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 8:
@@ -550,12 +550,12 @@ bool AIScriptMutant3::ChangeAnimationMode(int mode) {
case 12:
_animationState = 3;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 4:
if (_animationState >= 3 && _animationState <= 4) {
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
} else {
_animationState = 0;
_animationFrame = 0;
diff --git a/engines/bladerunner/script/ai/officer_grayford.cpp b/engines/bladerunner/script/ai/officer_grayford.cpp
index 7391cfda9d..723e6c6639 100644
--- a/engines/bladerunner/script/ai/officer_grayford.cpp
+++ b/engines/bladerunner/script/ai/officer_grayford.cpp
@@ -26,7 +26,7 @@ namespace BladeRunner {
AIScriptOfficerGrayford::AIScriptOfficerGrayford(BladeRunnerEngine *vm) : AIScriptBase(vm) {
_var1 = 0;
- _var2 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_var3 = 0;
}
@@ -37,7 +37,7 @@ void AIScriptOfficerGrayford::Initialize() {
_animationNext = 0;
_var1 = 0;
- _var2 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_var3 = 0;
Actor_Put_In_Set(kActorOfficerGrayford, kSetFreeSlotG);
@@ -971,11 +971,11 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
break;
case 9:
- if (!_animationFrame && _var2) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 625;
_animationState = 0;
_var1 = 0;
- _var2 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
*animation = 629;
++_animationFrame;
@@ -1298,7 +1298,7 @@ bool AIScriptOfficerGrayford::ChangeAnimationMode(int mode) {
case 15:
case 16:
case 17:
- _var2 = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 18:
@@ -1354,7 +1354,7 @@ bool AIScriptOfficerGrayford::ChangeAnimationMode(int mode) {
if (_animationState != 36 && _animationState != 34) {
_animationState = 9;
_animationFrame = 0;
- _var2 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -1408,49 +1408,49 @@ bool AIScriptOfficerGrayford::ChangeAnimationMode(int mode) {
case 12:
_animationState = 10;
_animationFrame = 0;
- _var2 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 11;
_animationFrame = 0;
- _var2 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
_animationState = 12;
_animationFrame = 0;
- _var2 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
_animationState = 13;
_animationFrame = 0;
- _var2 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 16:
_animationState = 14;
_animationFrame = 0;
- _var2 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 17:
_animationState = 15;
_animationFrame = 0;
- _var2 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 18:
_animationState = 16;
_animationFrame = 0;
- _var2 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 19:
_animationState = 17;
_animationFrame = 0;
- _var2 = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case kAnimationModeHit:
diff --git a/engines/bladerunner/script/ai/photographer.cpp b/engines/bladerunner/script/ai/photographer.cpp
index a6f88a3c40..f560da9de4 100644
--- a/engines/bladerunner/script/ai/photographer.cpp
+++ b/engines/bladerunner/script/ai/photographer.cpp
@@ -27,7 +27,7 @@ namespace BladeRunner {
AIScriptPhotographer::AIScriptPhotographer(BladeRunnerEngine *vm) : AIScriptBase(vm) {
_var1 = 0;
_var2 = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptPhotographer::Initialize() {
@@ -38,7 +38,7 @@ void AIScriptPhotographer::Initialize() {
_var1 = 0;
_var2 = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
bool AIScriptPhotographer::Update() {
@@ -216,13 +216,11 @@ bool AIScriptPhotographer::UpdateAnimation(int *animation, int *frame) {
case 2:
*animation = 747;
- if (_animationFrame == 0
- && _flag
- ) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 745;
_animationState = 0;
_var2 = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(747)) {
@@ -298,7 +296,7 @@ bool AIScriptPhotographer::ChangeAnimationMode(int mode) {
_var2 = 0;
_animationFrame = 0;
} else {
- _flag = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
}
break;
@@ -312,28 +310,28 @@ bool AIScriptPhotographer::ChangeAnimationMode(int mode) {
_animationState = 2;
_var2 = 0;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 12:
_animationState = 3;
_var2 = 0;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 4;
_var2 = 0;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
_animationState = 5;
_var2 = 0;
_animationFrame = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 43:
diff --git a/engines/bladerunner/script/ai/rachael.cpp b/engines/bladerunner/script/ai/rachael.cpp
index 6ebfd55303..fc3ff66d5c 100644
--- a/engines/bladerunner/script/ai/rachael.cpp
+++ b/engines/bladerunner/script/ai/rachael.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptRachael::AIScriptRachael(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
}
void AIScriptRachael::Initialize() {
@@ -34,7 +34,7 @@ void AIScriptRachael::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
Actor_Set_Goal_Number(kActorRachael, kGoalRachaelDefault);
}
@@ -222,7 +222,7 @@ bool AIScriptRachael::UpdateAnimation(int *animation, int *frame) {
break;
case 2:
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = kModelAnimationRachaelIdle;
_animationState = 0;
} else {
@@ -316,7 +316,7 @@ bool AIScriptRachael::ChangeAnimationMode(int mode) {
switch (mode) {
case kAnimationModeIdle:
if (_animationState >= 2 && _animationState <= 9) { // talking states
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
} else {
_animationState = 0; // idle state
_animationFrame = 0;
@@ -329,42 +329,42 @@ bool AIScriptRachael::ChangeAnimationMode(int mode) {
case kAnimationModeTalk:
_animationState = 2;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 12:
_animationState = 3;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 4;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
_animationState = 5;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
_animationState = 6;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 16:
_animationState = 7;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 17:
_animationState = 8;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 18:
_animationState = 9;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
default:
break;
diff --git a/engines/bladerunner/script/ai/rajif.cpp b/engines/bladerunner/script/ai/rajif.cpp
index 299ec7e027..dced687c61 100644
--- a/engines/bladerunner/script/ai/rajif.cpp
+++ b/engines/bladerunner/script/ai/rajif.cpp
@@ -112,7 +112,7 @@ bool AIScriptRajif::GoalChanged(int currentGoalNumber, int newGoalNumber) {
bool AIScriptRajif::UpdateAnimation(int *animation, int *frame) {
if (_animationState <= 1) {
- if (_animationState) {
+ if (_animationState > 0) {
*animation = 751;
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(751)) {
diff --git a/engines/bladerunner/script/ai/sadik.cpp b/engines/bladerunner/script/ai/sadik.cpp
index 2a9476f509..16669263f7 100644
--- a/engines/bladerunner/script/ai/sadik.cpp
+++ b/engines/bladerunner/script/ai/sadik.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptSadik::AIScriptSadik(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_nextSoundId = -1; // changed from original (0) to be more clear that this is an invalid sfx id
_var2 = 0;
_var3 = 0;
@@ -38,7 +38,7 @@ void AIScriptSadik::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_nextSoundId = -1; // changed from original (0) to be more clear that this is an invalid sfx id
_var2 = 0;
_var3 = 0;
@@ -519,11 +519,11 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
if (!Random_Query(0, 4)) {
_var3 = 1;
}
- if (!_animationFrame || _animationFrame == 8) {
+ if (_animationFrame == 0 || _animationFrame == 8) {
_var3 = Random_Query(2, 8);
}
if (!Random_Query(0, 2)) {
- if (!_animationFrame) {
+ if (_animationFrame == 0) {
_var2 = 1;
_var3 = 0;
*animation = 329;
@@ -698,10 +698,10 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
case 19:
*animation = 331;
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 328;
_animationState = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(331)) {
@@ -893,7 +893,7 @@ bool AIScriptSadik::ChangeAnimationMode(int mode) {
case 24:
case 25:
case 26:
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 30:
case 31:
diff --git a/engines/bladerunner/script/ai/sebastian.cpp b/engines/bladerunner/script/ai/sebastian.cpp
index 9868fed370..15d85deaca 100644
--- a/engines/bladerunner/script/ai/sebastian.cpp
+++ b/engines/bladerunner/script/ai/sebastian.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptSebastian::AIScriptSebastian(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptSebastian::Initialize() {
@@ -34,7 +34,7 @@ void AIScriptSebastian::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Set_Goal_Number(kActorSebastian, 0);
}
@@ -180,7 +180,7 @@ bool AIScriptSebastian::UpdateAnimation(int *animation, int *frame) {
break;
case 4:
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
Actor_Change_Animation_Mode(kActorSebastian, kAnimationModeIdle);
*animation = 811;
_animationState = 0;
@@ -279,7 +279,7 @@ bool AIScriptSebastian::ChangeAnimationMode(int mode) {
_animationState = 0;
_animationFrame = 0;
} else {
- _flag = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
}
break;
@@ -291,49 +291,49 @@ bool AIScriptSebastian::ChangeAnimationMode(int mode) {
case kAnimationModeTalk:
_animationState = 4;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 12:
_animationState = 5;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 6;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
_animationState = 7;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
_animationState = 8;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 16:
_animationState = 9;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 17:
_animationState = 10;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 18:
_animationState = 11;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 20:
diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp
index ae03406372..60fe314a38 100644
--- a/engines/bladerunner/script/ai/steele.cpp
+++ b/engines/bladerunner/script/ai/steele.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptSteele::AIScriptSteele(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_var1 = 0;
_var2 = 0;
}
@@ -36,7 +36,7 @@ void AIScriptSteele::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
_var1 = 0;
_var2 = 0;
@@ -1642,13 +1642,12 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
case 14:
*animation = kModelAnimationSteeleATalk;
- if (_animationFrame == 0
- && _flag
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag
) {
*animation = kModelAnimationSteeleIdle;
_animationFrame = 0;
_animationState = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
@@ -1709,14 +1708,13 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
case 20:
*animation = kModelAnimationSteeleWithGunAimingTalk;
- if (_animationFrame == 0
- && _flag
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag
) {
_animationFrame = 0;
_animationState = 23;
*animation = kModelAnimationSteeleWithGunShooting;
Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatIdle);
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
++_animationFrame;
if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
@@ -1897,13 +1895,12 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
break;
case 37:
- if (_animationFrame == 0
- && _flag
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag
) {
_animationFrame = 0;
_animationState = 0;
_var1 = 3;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
*animation = kModelAnimationSteeleWithGunAimingToRightTalk;
} else {
*animation = kModelAnimationSteeleWithGunAimingToRightTalk;
@@ -2038,13 +2035,13 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
case 17:
case 18:
case 19:
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 20:
case 21:
case 22:
case 37:
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
_animationState = 23;
_animationFrame = 0;
break;
@@ -2106,9 +2103,9 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
if (Game_Flag_Query(kFlagSteeleAimingAtGordo)) {
_animationState = 37;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
} else {
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 14;
_animationFrame = 0;
} else {
@@ -2117,13 +2114,13 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
_animationStateNext = 14;
_animationNext = kModelAnimationSteeleATalk;
}
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
}
break;
case kAnimationModeCombatIdle:
- if (_animationState) {
+ if (_animationState > 0) {
if (_animationState > 25
|| (_animationState != 23
&& _animationState != 25)
@@ -2157,7 +2154,7 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
break;
case 12:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 15;
_animationFrame = 0;
} else {
@@ -2166,11 +2163,11 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
_animationStateNext = 15;
_animationNext = kModelAnimationSteeleBTalk;
}
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 16;
_animationFrame = 0;
} else {
@@ -2179,11 +2176,11 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
_animationStateNext = 16;
_animationNext = kModelAnimationSteeleSmallLeftHandMoveTalk;
}
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 17;
_animationFrame = 0;
} else {
@@ -2192,11 +2189,11 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
_animationStateNext = 17;
_animationNext = kModelAnimationSteeleProtestTalk;
}
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 18;
_animationFrame = 0;
} else {
@@ -2205,11 +2202,11 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
_animationStateNext = 18;
_animationNext = kModelAnimationSteeleDismissTalk;
}
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 16:
- if (_animationState) {
+ if (_animationState > 0) {
_animationState = 19;
_animationFrame = 0;
} else {
@@ -2218,7 +2215,7 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
_animationStateNext = 19;
_animationNext = kModelAnimationSteeleDismissTalk;
}
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case kAnimationModeHit:
@@ -2307,19 +2304,19 @@ bool AIScriptSteele::ChangeAnimationMode(int mode) {
case 58:
_animationState = 20;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 59:
_animationState = 21;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 60:
_animationState = 22;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 86:
diff --git a/engines/bladerunner/script/ai/tyrell.cpp b/engines/bladerunner/script/ai/tyrell.cpp
index 96d7c40f44..6434625ee7 100644
--- a/engines/bladerunner/script/ai/tyrell.cpp
+++ b/engines/bladerunner/script/ai/tyrell.cpp
@@ -25,7 +25,7 @@
namespace BladeRunner {
AIScriptTyrell::AIScriptTyrell(BladeRunnerEngine *vm) : AIScriptBase(vm) {
- _flag = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
_var = 0;
}
@@ -35,7 +35,7 @@ void AIScriptTyrell::Initialize() {
_animationStateNext = 0;
_animationNext = 0;
- _flag = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
_var = 0;
Actor_Set_Goal_Number(kActorTyrell, 0);
@@ -137,7 +137,7 @@ bool AIScriptTyrell::UpdateAnimation(int *animation, int *frame) {
break;
case 2:
- if (!_animationFrame && _flag) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 766;
_animationState = 0;
} else {
@@ -199,42 +199,42 @@ bool AIScriptTyrell::UpdateAnimation(int *animation, int *frame) {
bool AIScriptTyrell::ChangeAnimationMode(int mode) {
switch (mode) {
- case 0:
+ case kAnimationModeIdle:
if (_animationState >= 2 && _animationState <= 6) {
- _flag = 1;
+ _resumeIdleAfterFramesetCompletesFlag = true;
} else {
_animationState = 0;
_animationFrame = 0;
}
break;
- case 1:
+ case kAnimationModeWalk:
_animationState = 1;
_animationFrame = 0;
break;
- case 3:
+ case kAnimationModeTalk:
_animationState = 2;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 12:
_animationState = 3;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 13:
_animationState = 4;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 14:
_animationState = 5;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
case 15:
_animationState = 6;
_animationFrame = 0;
- _flag = 0;
+ _resumeIdleAfterFramesetCompletesFlag = false;
break;
default:
break;
diff --git a/engines/bladerunner/script/ai/tyrell_guard.cpp b/engines/bladerunner/script/ai/tyrell_guard.cpp
index f5416065ec..4647c4fa81 100644
--- a/engines/bladerunner/script/ai/tyrell_guard.cpp
+++ b/engines/bladerunner/script/ai/tyrell_guard.cpp
@@ -26,7 +26,7 @@ namespace BladeRunner {
AIScriptTyrellGuard::AIScriptTyrellGuard(BladeRunnerEngine *vm) : AIScriptBase(vm) {
_frameDelta = 1;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
void AIScriptTyrellGuard::Initialize() {
@@ -36,7 +36,7 @@ void AIScriptTyrellGuard::Initialize() {
_animationNext = 0;
_frameDelta = 1;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
Actor_Set_Goal_Number(kActorTyrellGuard, 0);
}
@@ -176,9 +176,7 @@ bool AIScriptTyrellGuard::UpdateAnimation(int *animation, int *frame) {
case 3:
*animation = 558;
- if (_animationFrame == 0
- && _flag1
- ) {
+ if (_animationFrame == 0 && _resumeIdleAfterFramesetCompletesFlag) {
*animation = 555;
_animationState = 0;
} else {
@@ -288,7 +286,7 @@ bool AIScriptTyrellGuard::ChangeAnimationMode(int mode) {
case 5:
case 6:
case 7:
- _flag1 = true;
+ _resumeIdleAfterFramesetCompletesFlag = true;
break;
case 8:
break;
@@ -305,7 +303,7 @@ bool AIScriptTyrellGuard::ChangeAnimationMode(int mode) {
} else if ((_animationState - 1 != 7 && _animationState - 1 != 10) || _animationState - 1 > 10) {
_animationState = 3;
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -315,7 +313,7 @@ bool AIScriptTyrellGuard::ChangeAnimationMode(int mode) {
} else if ((_animationState - 1 != 7 && _animationState - 1 != 10) || _animationState - 1 > 10) {
_animationState = 4;
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -325,7 +323,7 @@ bool AIScriptTyrellGuard::ChangeAnimationMode(int mode) {
} else if ((_animationState - 1 != 7 && _animationState - 1 != 10) || _animationState - 1 > 10) {
_animationState = 5;
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -335,7 +333,7 @@ bool AIScriptTyrellGuard::ChangeAnimationMode(int mode) {
} else if ((_animationState - 1 != 7 && _animationState - 1 != 10) || _animationState - 1 > 10) {
_animationState = 6;
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
@@ -345,7 +343,7 @@ bool AIScriptTyrellGuard::ChangeAnimationMode(int mode) {
} else if ((_animationState - 1 != 7 && _animationState - 1 != 10) || _animationState - 1 > 10) {
_animationState = 7;
_animationFrame = 0;
- _flag1 = false;
+ _resumeIdleAfterFramesetCompletesFlag = false;
}
break;
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index 722f16505e..e39ab205d7 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -117,7 +117,7 @@ DECLARE_SCRIPT(McCoy)
END_SCRIPT
DECLARE_SCRIPT(Steele)
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
int _var1;
int _var2;
@@ -125,7 +125,7 @@ DECLARE_SCRIPT(Steele)
END_SCRIPT
DECLARE_SCRIPT(Gordo)
- int var_45B078;
+ bool _resumeIdleAfterFramesetCompletesFlag;
int _counter;
int _counterTarget;
int _frameMin;
@@ -141,7 +141,7 @@ DECLARE_SCRIPT(Gordo)
END_SCRIPT
DECLARE_SCRIPT(Dektora)
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
float _x, _y, _z;
double comp_distance(int actorId, float x1, float y1, float z1);
@@ -152,7 +152,7 @@ DECLARE_SCRIPT(Guzza)
int _frameDelta;
int _counter;
int _state;
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(Clovis)
@@ -161,14 +161,14 @@ DECLARE_SCRIPT(Clovis)
int _var3;
int _var4;
int _var5;
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
void shotAnim();
void someAnim();
END_SCRIPT
DECLARE_SCRIPT(Lucy)
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
void voightKampffTest();
void checkCombat();
@@ -179,7 +179,7 @@ DECLARE_SCRIPT(Izo)
int _var2;
int _var3;
int _var4;
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
void dialogueWithIzo();
void modifyWaypoints();
@@ -190,15 +190,15 @@ DECLARE_SCRIPT(Sadik)
int _var2;
int _var3;
int _var4;
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(Crazylegs)
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(Luther)
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(Grigorian)
@@ -228,7 +228,7 @@ DECLARE_SCRIPT(Runciter)
END_SCRIPT
DECLARE_SCRIPT(InsectDealer)
- bool _flag1;
+ bool _resumeIdleAfterFramesetCompletesFlag;
int _state;
int _frameDelta;
int _var2;
@@ -237,14 +237,14 @@ END_SCRIPT
DECLARE_SCRIPT(TyrellGuard)
int _frameDelta;
- bool _flag1;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(EarlyQ)
int _var1;
int _var2;
int _var3;
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(Zuben)
@@ -270,7 +270,7 @@ DECLARE_SCRIPT(Marcus)
END_SCRIPT
DECLARE_SCRIPT(Mia)
- bool _flag1;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(OfficerLeary)
@@ -280,12 +280,12 @@ END_SCRIPT
DECLARE_SCRIPT(OfficerGrayford)
int _var1;
- int _var2;
+ bool _resumeIdleAfterFramesetCompletesFlag;
int _var3;
END_SCRIPT
DECLARE_SCRIPT(Hanoi)
- int _var1;
+ bool _resumeIdleAfterFramesetCompletesFlag;
bool _flag1;
int _var3;
int _var4;
@@ -296,7 +296,7 @@ END_SCRIPT
DECLARE_SCRIPT(DeskClerk)
bool _flag1;
- bool _flag2;
+ bool _resumeIdleAfterFramesetCompletesFlag;
int _var3;
END_SCRIPT
@@ -305,25 +305,25 @@ DECLARE_SCRIPT(HowieLee)
END_SCRIPT
DECLARE_SCRIPT(FishDealer)
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(Klein)
END_SCRIPT
DECLARE_SCRIPT(Murray)
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(HawkersBarkeep)
int _var1;
int _var2;
int _var3;
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(Holloway)
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(SergeantWalls)
@@ -340,7 +340,7 @@ END_SCRIPT
DECLARE_SCRIPT(Photographer)
int _var1;
int _var2;
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(Dispatcher)
@@ -358,7 +358,7 @@ END_SCRIPT
DECLARE_SCRIPT(EarlyQBartender)
int _var1;
int _var2;
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(HawkersParrot)
@@ -387,7 +387,7 @@ DECLARE_SCRIPT(ShoeshineMan)
END_SCRIPT
DECLARE_SCRIPT(Tyrell)
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
int _var;
END_SCRIPT
@@ -395,7 +395,7 @@ DECLARE_SCRIPT(Chew)
int _var1;
int _var2;
int _var3;
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(Gaff)
@@ -408,14 +408,14 @@ DECLARE_SCRIPT(Taffy)
END_SCRIPT
DECLARE_SCRIPT(Sebastian)
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
void dialogue();
void setMcCoyIsABladeRunner();
END_SCRIPT
DECLARE_SCRIPT(Rachael)
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
void dialogue_start();
void dialogue_agenda1();
@@ -424,7 +424,7 @@ DECLARE_SCRIPT(Rachael)
END_SCRIPT
DECLARE_SCRIPT(GeneralDoll)
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(Isabella)
@@ -441,7 +441,7 @@ DECLARE_SCRIPT(Newscaster)
END_SCRIPT
DECLARE_SCRIPT(Leon)
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
float _mcCoyPositionX;
float _mcCoyPositionY;
float _mcCoyPositionZ;
@@ -515,17 +515,17 @@ DECLARE_SCRIPT(GenericWalkerC)
END_SCRIPT
DECLARE_SCRIPT(Mutant1)
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(Mutant2)
int _var1;
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
DECLARE_SCRIPT(Mutant3)
int _var1;
- bool _flag;
+ bool _resumeIdleAfterFramesetCompletesFlag;
END_SCRIPT
#undef DECLARE_SCRIPT
More information about the Scummvm-git-logs
mailing list