diff options
author | aap <aap@papnet.eu> | 2019-07-20 14:39:38 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-07-20 14:39:38 +0200 |
commit | 60045ec6cd5fe5bd650cf62442283e50d4a4c233 (patch) | |
tree | 40844313ea09daa35f96c8b7da7c1ba3a6d302e6 /src/animation/AnimBlendAssocGroup.cpp | |
parent | Merge pull request #149 from ShFil119/audio4 (diff) | |
download | re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.gz re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.bz2 re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.lz re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.xz re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.zst re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.zip |
Diffstat (limited to 'src/animation/AnimBlendAssocGroup.cpp')
-rw-r--r-- | src/animation/AnimBlendAssocGroup.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp index fbca92b7..05f9a06a 100644 --- a/src/animation/AnimBlendAssocGroup.cpp +++ b/src/animation/AnimBlendAssocGroup.cpp @@ -116,14 +116,13 @@ CAnimBlendAssocGroup::CreateAssociations(const char *name) for(i = 0; i < animBlock->numAnims; i++){ CAnimBlendHierarchy *anim = CAnimManager::GetAnimation(animBlock->firstIndex + i); CBaseModelInfo *model = GetModelFromName(anim->name); + assert(model); printf("Associated anim %s with model %s\n", anim->name, model->GetName()); - if(model){ - RpClump *clump = (RpClump*)model->CreateInstance(); - RpAnimBlendClumpInit(clump); - assocList[i].Init(clump, anim); - RpClumpDestroy(clump); - assocList[i].animId = i; - } + RpClump *clump = (RpClump*)model->CreateInstance(); + RpAnimBlendClumpInit(clump); + assocList[i].Init(clump, anim); + RpClumpDestroy(clump); + assocList[i].animId = i; } numAssociations = animBlock->numAnims; } |