diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-06-22 11:07:16 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-06-22 11:07:16 -0400 |
| commit | f9d40ebad822d9d873e05f0fbe52990dc538179e (patch) | |
| tree | 20b37f53f7909efee3c4d33486232e62ebfd1053 /src/d/actor/d_a_npc_md.cpp | |
| parent | c836c5ca1f14fa629a82e02ea74fb681a7c94e6b (diff) | |
Use NULL macro in asserts, fix NULL macro to match
Diffstat (limited to 'src/d/actor/d_a_npc_md.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_md.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index 5fc98378..0e739794 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -759,7 +759,7 @@ BOOL daNpc_Md_c::createHeap() { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(mModelArcName, "md.bdl"); - JUT_ASSERT(1995, modelData != 0); + JUT_ASSERT(1995, modelData != NULL); mpMorf = new mDoExt_McaMorf2( modelData, @@ -805,7 +805,7 @@ BOOL daNpc_Md_c::createHeap() { mpMorf->getModel()->setUserArea((u32)this); modelData = (J3DModelData*)dComIfG_getObjectRes(mModelArcName, "mdarm.bdl"); - JUT_ASSERT(2051, modelData != 0); + JUT_ASSERT(2051, modelData != NULL); mpArmMorf = new mDoExt_McaMorf2( modelData, @@ -835,7 +835,7 @@ BOOL daNpc_Md_c::createHeap() { if (!isTypeShipRide()) { modelData = (J3DModelData*)dComIfG_getObjectRes(mModelArcName, "mdwing.bdl"); - JUT_ASSERT(2083, modelData != 0); + JUT_ASSERT(2083, modelData != NULL); mpWingMorf = new mDoExt_McaMorf( modelData, @@ -2198,7 +2198,7 @@ BOOL daNpc_Md_c::initTexPatternAnm(u8 btpAnmTblIdx, bool param_2) { J3DModelData* modelData = mpMorf->getModel()->getModelData(); bool ret = false; J3DAnmTexPattern* eyeTexPtrn = (J3DAnmTexPattern*)dComIfG_getObjectRes(mModelArcName, btpAnmTbl[btpAnmTblIdx].m00); - JUT_ASSERT(7502, eyeTexPtrn != 0); + JUT_ASSERT(7502, eyeTexPtrn != NULL); if (m0520.init(modelData, eyeTexPtrn, TRUE, J3DFrameCtrl::LOOP_ONCE_RESET_e, 1.0f, 0, -1, param_2, 0)) { m3112 = eyeTexPtrn->getFrameMax(); m3133 = 0; |