summaryrefslogtreecommitdiffstats
path: root/src/animation
diff options
context:
space:
mode:
authorFire-Head <Fire-Head@users.noreply.github.com>2019-06-17 15:32:38 +0200
committerFire-Head <Fire-Head@users.noreply.github.com>2019-06-17 15:32:38 +0200
commit617eb6951a04d7a76d132aa0f144e7b3c4702925 (patch)
treefb6444638c35ae1e6a178fabf5d49b0801f666e7 /src/animation
parentMerge pull request #8 from GTAmodding/master (diff)
downloadre3-617eb6951a04d7a76d132aa0f144e7b3c4702925.tar
re3-617eb6951a04d7a76d132aa0f144e7b3c4702925.tar.gz
re3-617eb6951a04d7a76d132aa0f144e7b3c4702925.tar.bz2
re3-617eb6951a04d7a76d132aa0f144e7b3c4702925.tar.lz
re3-617eb6951a04d7a76d132aa0f144e7b3c4702925.tar.xz
re3-617eb6951a04d7a76d132aa0f144e7b3c4702925.tar.zst
re3-617eb6951a04d7a76d132aa0f144e7b3c4702925.zip
Diffstat (limited to 'src/animation')
-rw-r--r--src/animation/AnimBlendAssociation.cpp6
-rw-r--r--src/animation/AnimBlendClumpData.cpp4
2 files changed, 3 insertions, 7 deletions
diff --git a/src/animation/AnimBlendAssociation.cpp b/src/animation/AnimBlendAssociation.cpp
index eb7019ab..0e8d3d09 100644
--- a/src/animation/AnimBlendAssociation.cpp
+++ b/src/animation/AnimBlendAssociation.cpp
@@ -5,10 +5,7 @@
#include "RpAnimBlend.h"
#include "AnimManager.h"
#include "AnimBlendAssociation.h"
-
-// TODO: implement those
-#define RwFreeAlign RwFree
-#define RwMallocAlign(sz, algn) RwMalloc(sz)
+#include "RwHelper.h"
CAnimBlendAssociation::CAnimBlendAssociation(void)
{
@@ -57,6 +54,7 @@ CAnimBlendAssociation::AllocateAnimBlendNodeArray(int n)
void
CAnimBlendAssociation::FreeAnimBlendNodeArray(void)
{
+ ASSERT( nodes != NULL );
RwFreeAlign(nodes);
}
diff --git a/src/animation/AnimBlendClumpData.cpp b/src/animation/AnimBlendClumpData.cpp
index 73e71246..06625eb5 100644
--- a/src/animation/AnimBlendClumpData.cpp
+++ b/src/animation/AnimBlendClumpData.cpp
@@ -1,10 +1,8 @@
#include "common.h"
#include "patcher.h"
#include "AnimBlendClumpData.h"
+#include "RwHelper.h"
-// TODO: implement those
-#define RwFreeAlign RwFree
-#define RwMallocAlign(sz, algn) RwMalloc(sz)
CAnimBlendClumpData::CAnimBlendClumpData(void)
{