diff options
| author | aap <aap@papnet.eu> | 2019-07-07 09:44:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-07 09:44:04 +0200 |
| commit | 0384d7ceb458b5b6e0093e93f7c78a3aff9272b7 (patch) | |
| tree | 0aec680fb9460225c18231d26d78b75f522c2592 /src/animation | |
| parent | some work on vehicles (diff) | |
| parent | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff) | |
| download | re3-0384d7ceb458b5b6e0093e93f7c78a3aff9272b7.tar re3-0384d7ceb458b5b6e0093e93f7c78a3aff9272b7.tar.gz re3-0384d7ceb458b5b6e0093e93f7c78a3aff9272b7.tar.bz2 re3-0384d7ceb458b5b6e0093e93f7c78a3aff9272b7.tar.lz re3-0384d7ceb458b5b6e0093e93f7c78a3aff9272b7.tar.xz re3-0384d7ceb458b5b6e0093e93f7c78a3aff9272b7.tar.zst re3-0384d7ceb458b5b6e0093e93f7c78a3aff9272b7.zip | |
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/AnimBlendAssociation.h | 2 | ||||
| -rw-r--r-- | src/animation/AnimManager.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/animation/AnimBlendAssociation.h b/src/animation/AnimBlendAssociation.h index d846a4d3..a7e127f7 100644 --- a/src/animation/AnimBlendAssociation.h +++ b/src/animation/AnimBlendAssociation.h @@ -77,7 +77,7 @@ public: void UpdateTime(float timeDelta, float relSpeed); bool UpdateBlend(float timeDelta); - float GetTimeLeft() { return hierarchy->totalLength - currentTime; } + inline float GetTimeLeft() { return hierarchy->totalLength - currentTime; } static CAnimBlendAssociation *FromLink(CAnimBlendLink *l) { return (CAnimBlendAssociation*)((uint8*)l - offsetof(CAnimBlendAssociation, link)); diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp index 73fc4d94..6ad63e49 100644 --- a/src/animation/AnimManager.cpp +++ b/src/animation/AnimManager.cpp @@ -752,7 +752,7 @@ CAnimManager::LoadAnimFiles(void) AnimAssocDefinition *def = &CAnimManager::ms_aAnimAssocDefinitions[i]; group->CreateAssociations(def->blockName, clump, def->animNames, def->numAnims); for(j = 0; j < group->numAssociations; j++) - group->GetAnimation(def->animDescs[j].animId)->flags |= def->animDescs[j].flags; + group->GetAnimation(j)->flags |= def->animDescs[j].flags; RpClumpDestroy(clump); } } |