diff options
| author | aap <aap@papnet.eu> | 2020-05-10 10:04:20 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-10 10:04:20 +0200 |
| commit | e9fbd2ccfd9bd70cfdae0161f4c32aa29f6b7274 (patch) | |
| tree | bab6161fcd3d49bd6805619cb304d6958d1147a1 /src/animation/AnimManager.cpp | |
| parent | Merge pull request #528 from Nick007J/miami (diff) | |
| download | re3-e9fbd2ccfd9bd70cfdae0161f4c32aa29f6b7274.tar re3-e9fbd2ccfd9bd70cfdae0161f4c32aa29f6b7274.tar.gz re3-e9fbd2ccfd9bd70cfdae0161f4c32aa29f6b7274.tar.bz2 re3-e9fbd2ccfd9bd70cfdae0161f4c32aa29f6b7274.tar.lz re3-e9fbd2ccfd9bd70cfdae0161f4c32aa29f6b7274.tar.xz re3-e9fbd2ccfd9bd70cfdae0161f4c32aa29f6b7274.tar.zst re3-e9fbd2ccfd9bd70cfdae0161f4c32aa29f6b7274.zip | |
Diffstat (limited to 'src/animation/AnimManager.cpp')
| -rw-r--r-- | src/animation/AnimManager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp index c31d7a5b..63dc172c 100644 --- a/src/animation/AnimManager.cpp +++ b/src/animation/AnimManager.cpp @@ -145,7 +145,7 @@ AnimAssocDesc aStdAnimDescs[] = { { ANIM_DRIVEBY_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL }, { ANIM_CAR_LB, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL }, { ANIM_DRIVE_BOAT, ASSOC_DELETEFADEDOUT }, - { ANIM_CAR_GETOUT_LHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, + { ANIM_CAR_GETOUT_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_CAR_GETOUT_LOW_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_CAR_CLOSE_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_CAR_HOOKERTALK, ASSOC_REPEAT | ASSOC_PARTIAL }, @@ -906,6 +906,7 @@ CAnimManager::LoadAnimFile(RwStream *stream, bool compress, char (*somename)[32] int animIndex = animBlock->firstIndex; for(j = 0; j < animBlock->numAnims; j++){ + assert(animIndex < ARRAY_SIZE(ms_aAnimations)); CAnimBlendHierarchy *hier = &ms_aAnimations[animIndex++]; // animation name |