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_ghostship.cpp | |
| parent | c836c5ca1f14fa629a82e02ea74fb681a7c94e6b (diff) | |
Use NULL macro in asserts, fix NULL macro to match
Diffstat (limited to 'src/d/actor/d_a_ghostship.cpp')
| -rw-r--r-- | src/d/actor/d_a_ghostship.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index e7bea9a9..f6cbab54 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -38,7 +38,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) { /* 00000118-0000032C .text _createHeap__13daGhostship_cFv */ BOOL daGhostship_c::_createHeap() { J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BDL_AYUSH)); - JUT_ASSERT(88, modelData != 0); + JUT_ASSERT(88, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if(!mpModel) { @@ -46,7 +46,7 @@ BOOL daGhostship_c::_createHeap() { } J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BTK_AYUSH)); - JUT_ASSERT(95, btk != 0); + JUT_ASSERT(95, btk != NULL); if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) { return false; @@ -356,7 +356,7 @@ bool daGhostship_c::_execute() { if(mAlpha == l_HIO.shipAlpha && dist < l_HIO.shipEnterDist && dComIfGs_getEventReg(0x8803) < 3 && !mbEnteredShip) { mDoAud_seStart(JA_SE_LK_WARP_TO_G_SHIP); stage_scls_info_class* scls_data = dComIfGd_getMeshSceneList(current.pos); - JUT_ASSERT(463, scls_data != 0) + JUT_ASSERT(463, scls_data != NULL) u8 startCode = scls_data->mStart; dComIfGs_setEventReg(0xC3FF, scls_data->mRoom); |