diff options
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DAnimation.h | 6 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 041ce31875..f38c79ef9a 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -1,11 +1,13 @@ #ifndef J3DANIMATION_H #define J3DANIMATION_H -#include "JSystem/J3DGraphAnimator/J3DModelData.h" -#include "JSystem/JUtility/JUTAssert.h" +#include "JSystem/J3DAssert.h" #include "JSystem/JUtility/JUTNameTab.h" +#include <dolphin/mtx.h> #include "global.h" +class J3DTransformInfo; + struct JUTDataBlockHeader { /* 0x0 */ u32 mType; /* 0x4 */ u32 mSize; diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h index 2403c8384a..ff41bc4f01 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h +++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h @@ -93,7 +93,10 @@ public: J3D_ASSERT_NULLPTR(214, pAnmTexPattern != NULL); } - virtual void calc(u16* param_0) const { mAnmTexPattern->getTexNo(field_0x4, param_0); } + virtual void calc(u16* param_0) const { + J3D_ASSERT_NULLPTR(532, param_0); + mAnmTexPattern->getTexNo(field_0x4, param_0); + } void operator=(J3DTexNoAnm const& other) { mAnmTexPattern = other.mAnmTexPattern; |
