summaryrefslogtreecommitdiffstats
path: root/src/animation
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-17 23:31:00 +0200
committeraap <aap@papnet.eu>2019-06-17 23:31:00 +0200
commitad122405863fd2385e07fb9b22187374b1a1bff0 (patch)
tree9a59ce237de24773f892ff0f551b211845da2e3f /src/animation
parentforgot main.h (diff)
downloadre3-ad122405863fd2385e07fb9b22187374b1a1bff0.tar
re3-ad122405863fd2385e07fb9b22187374b1a1bff0.tar.gz
re3-ad122405863fd2385e07fb9b22187374b1a1bff0.tar.bz2
re3-ad122405863fd2385e07fb9b22187374b1a1bff0.tar.lz
re3-ad122405863fd2385e07fb9b22187374b1a1bff0.tar.xz
re3-ad122405863fd2385e07fb9b22187374b1a1bff0.tar.zst
re3-ad122405863fd2385e07fb9b22187374b1a1bff0.zip
Diffstat (limited to 'src/animation')
-rw-r--r--src/animation/AnimBlendAssocGroup.cpp2
-rw-r--r--src/animation/AnimBlendAssociation.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp
index 8b0001ac..fbca92b7 100644
--- a/src/animation/AnimBlendAssocGroup.cpp
+++ b/src/animation/AnimBlendAssocGroup.cpp
@@ -139,7 +139,7 @@ CAnimBlendAssocGroup::CreateAssociations(const char *blockName, RpClump *clump,
DestroyAssociations();
animBlock = CAnimManager::GetAnimationBlock(blockName);
- assocList = new CAnimBlendAssociation[animBlock->numAnims];
+ assocList = new CAnimBlendAssociation[numAssocs];
numAssociations = 0;
for(i = 0; i < numAssocs; i++){
diff --git a/src/animation/AnimBlendAssociation.cpp b/src/animation/AnimBlendAssociation.cpp
index 0e8d3d09..d94fe2c1 100644
--- a/src/animation/AnimBlendAssociation.cpp
+++ b/src/animation/AnimBlendAssociation.cpp
@@ -54,7 +54,7 @@ CAnimBlendAssociation::AllocateAnimBlendNodeArray(int n)
void
CAnimBlendAssociation::FreeAnimBlendNodeArray(void)
{
- ASSERT( nodes != NULL );
+ assert(nodes != nil);
RwFreeAlign(nodes);
}