diff options
author | aap <aap@papnet.eu> | 2019-06-17 22:40:31 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-06-17 22:40:31 +0200 |
commit | e524a1a3261627b749255a4dbef9690335662ed7 (patch) | |
tree | 614c2732b7e98926b2948e1ffdd885fc11478c2d /src/animation | |
parent | first part of CFileLoader (diff) | |
parent | Merge pull request #23 from Fire-Head/master (diff) | |
download | re3-e524a1a3261627b749255a4dbef9690335662ed7.tar re3-e524a1a3261627b749255a4dbef9690335662ed7.tar.gz re3-e524a1a3261627b749255a4dbef9690335662ed7.tar.bz2 re3-e524a1a3261627b749255a4dbef9690335662ed7.tar.lz re3-e524a1a3261627b749255a4dbef9690335662ed7.tar.xz re3-e524a1a3261627b749255a4dbef9690335662ed7.tar.zst re3-e524a1a3261627b749255a4dbef9690335662ed7.zip |
Diffstat (limited to '')
-rw-r--r-- | src/animation/AnimBlendAssociation.cpp | 6 | ||||
-rw-r--r-- | src/animation/AnimBlendClumpData.cpp | 4 |
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) { |