diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-10 11:26:32 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-10 11:26:32 +0200 |
commit | a827f0dd559331d756f57ddf63e535d100503ab2 (patch) | |
tree | 30e72a7fb5ab5fe27bf9b0f810486854c0814991 /src/animation | |
parent | more car control (diff) | |
parent | CClumpModelInfo; little fixes (diff) | |
download | re3-a827f0dd559331d756f57ddf63e535d100503ab2.tar re3-a827f0dd559331d756f57ddf63e535d100503ab2.tar.gz re3-a827f0dd559331d756f57ddf63e535d100503ab2.tar.bz2 re3-a827f0dd559331d756f57ddf63e535d100503ab2.tar.lz re3-a827f0dd559331d756f57ddf63e535d100503ab2.tar.xz re3-a827f0dd559331d756f57ddf63e535d100503ab2.tar.zst re3-a827f0dd559331d756f57ddf63e535d100503ab2.zip |
Diffstat (limited to 'src/animation')
-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 |