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_obj_barrier.cpp | |
| parent | c836c5ca1f14fa629a82e02ea74fb681a7c94e6b (diff) | |
Use NULL macro in asserts, fix NULL macro to match
Diffstat (limited to 'src/d/actor/d_a_obj_barrier.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_barrier.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 4cb976e4..ece99613 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -299,8 +299,8 @@ void daObjBarrier_ef_c::setDummyTexture(int i_idx) { J3DTexture* texture = modelData->getTexture(); JUTNameTab* textureName = modelData->getTextureName(); - JUT_ASSERT(808, texture != 0); - JUT_ASSERT(809, textureName != 0); + JUT_ASSERT(808, texture != NULL); + JUT_ASSERT(809, textureName != NULL); for (u16 i = 0; i < texture->getNum(); i++) { if (strcmp(textureName->getName(i), "__dummy") == 0) { @@ -375,13 +375,13 @@ void daObjBarrier_ef_c::birth(fopAc_ac_c* i_hitActor, f32 i_radius, cXyz i_cente J3DModelData* modelData = mpModel[effect_idx]->getModelData(); J3DAnmTextureSRTKey* btk_anm_p = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BTK_YHRBR00)); - JUT_ASSERT(937, btk_anm_p != 0); + JUT_ASSERT(937, btk_anm_p != NULL); J3DAnmTransform* bck_anm_p = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, YCAGE_BCK_YHRBR00)); - JUT_ASSERT(942, bck_anm_p != 0); + JUT_ASSERT(942, bck_anm_p != NULL); J3DAnmTevRegKey* brk_anm_p = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YHRBR00)); - JUT_ASSERT(947, brk_anm_p != 0); + JUT_ASSERT(947, brk_anm_p != NULL); mBtk[effect_idx].init(modelData, btk_anm_p, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, true, 0); |