summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_obj_ferris.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2024-06-22 11:07:16 -0400
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2024-06-22 11:07:16 -0400
commitf9d40ebad822d9d873e05f0fbe52990dc538179e (patch)
tree20b37f53f7909efee3c4d33486232e62ebfd1053 /src/d/actor/d_a_obj_ferris.cpp
parentc836c5ca1f14fa629a82e02ea74fb681a7c94e6b (diff)
Use NULL macro in asserts, fix NULL macro to match
Diffstat (limited to 'src/d/actor/d_a_obj_ferris.cpp')
-rw-r--r--src/d/actor/d_a_obj_ferris.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_obj_ferris.cpp b/src/d/actor/d_a_obj_ferris.cpp
index 7af67751..13a82a9e 100644
--- a/src/d/actor/d_a_obj_ferris.cpp
+++ b/src/d/actor/d_a_obj_ferris.cpp
@@ -91,14 +91,14 @@ BOOL daObjFerris::Act_c::solidHeapCB(fopAc_ac_c* i_this) {
bool daObjFerris::Act_c::create_heap() {
s32 i;
J3DModelData* mdl_data_gondola = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, SKANRAN_BDL_SGONDOR));
- JUT_ASSERT(0x183, mdl_data_gondola != 0);
+ JUT_ASSERT(0x183, mdl_data_gondola != NULL);
if (mdl_data_gondola != NULL) {
for (i = 0; i < 5; i++)
mpModel[i] = mDoExt_J3DModel__create(mdl_data_gondola, 0, 0x11020203);
}
J3DModelData* mdl_data_wheelbase = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, SKANRAN_BDL_SKANRAN));
- JUT_ASSERT(0x18c, mdl_data_wheelbase != 0);
+ JUT_ASSERT(0x18c, mdl_data_wheelbase != NULL);
if (mdl_data_wheelbase != NULL) {
mpModel[5] = mDoExt_J3DModel__create(mdl_data_wheelbase, 0, 0x11020203);
}
@@ -107,7 +107,7 @@ bool daObjFerris::Act_c::create_heap() {
init_mtx();
cBgD_t* bgw_data_gondola = static_cast<cBgD_t*>(dComIfG_getObjectRes(M_arcname, SKANRAN_DZB_SGONDOR));
- JUT_ASSERT(0x1a0, bgw_data_gondola != 0);
+ JUT_ASSERT(0x1a0, bgw_data_gondola != NULL);
if (bgw_data_gondola != NULL) {
for (i = 0; i < 5; i++) {
mpBgW[i] = new dBgW();
@@ -117,7 +117,7 @@ bool daObjFerris::Act_c::create_heap() {
}
cBgD_t* bgw_data_wheelbase = static_cast<cBgD_t*>(dComIfG_getObjectRes(M_arcname, SKANRAN_DZB_SKANRAN));
- JUT_ASSERT(0x1b0, bgw_data_wheelbase != 0);
+ JUT_ASSERT(0x1b0, bgw_data_wheelbase != NULL);
if (bgw_data_wheelbase != NULL) {
mpBgW[5] = new dBgW();
if (mpBgW[5] != NULL && mpBgW[5]->Set(bgw_data_wheelbase, dBgW::MOVE_BG_e, &mMtx[5]) == 1)