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/d_stage.cpp | |
| parent | c836c5ca1f14fa629a82e02ea74fb681a7c94e6b (diff) | |
Use NULL macro in asserts, fix NULL macro to match
Diffstat (limited to 'src/d/d_stage.cpp')
| -rw-r--r-- | src/d/d_stage.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index c7ccf936..5b76a269 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1377,7 +1377,7 @@ stage_actor_data_class* dStage_decodeSearchIkada(void* i_file, int ikadaShipId) /* 8004184C-800419D0 .text dStage_playerInitIkada__FP16fopAcM_prm_classPv */ void dStage_playerInitIkada(fopAcM_prm_class* player_prm, void* i_file) { stage_actor_data_class* ikada_data = dStage_decodeSearchIkada(i_file, dComIfGp_getIkadaShipId()); - JUT_ASSERT(1590, ikada_data != 0); + JUT_ASSERT(1590, ikada_data != NULL); u8 roomNo = dComIfGp_getIkadaShipBeforeRoomId(); player_prm->mParameter = 0xFF000000 | roomNo; @@ -1437,7 +1437,7 @@ int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* i_file) i_stage->setPlayerNum(num); fopAcM_prm_class* appen = fopAcM_CreateAppend(); - JUT_ASSERT(1735, appen != 0); + JUT_ASSERT(1735, appen != NULL); int point = dComIfGp_getStartStagePoint(); u32 roomParam = dComIfGs_getRestartRoomParam(); @@ -1484,7 +1484,7 @@ int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* i_file) dStage_actorCreate(player_data, appen); scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); - JUT_ASSERT(1842, stageProc != 0); + JUT_ASSERT(1842, stageProc != NULL); if (stageProc->base.base.mProcName != PROC_PLAY_SCENE) { fopAcM_create(PROC_TITLE, 0); @@ -1808,7 +1808,7 @@ int dStage_memaInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, void*) { for (int i = 0; i < pd->num; i++) { JKRExpHeap* heap = dStage_roomControl_c::createMemoryBlock(i, *entry_p + 0x300); - JUT_ASSERT(2932, heap != 0); + JUT_ASSERT(2932, heap != NULL); entry_p++; } } @@ -1999,8 +1999,8 @@ void dStage_dt_c_offsetToPtr(void* i_data) { void dStage_dt_c_stageInitLoader(void* i_data, dStage_dt_c* i_stage) { static FuncTable l_funcTable[] = {"STAG", dStage_stagInfoInit}; - JUT_ASSERT(3557, i_data != 0); - JUT_ASSERT(3558, i_stage != 0); + JUT_ASSERT(3557, i_data != NULL); + JUT_ASSERT(3558, i_stage != NULL); dStage_dt_c_offsetToPtr(i_data); i_stage->init(); @@ -2153,7 +2153,7 @@ void dStage_dt_c_roomReLoader(void* i_data, dStage_dt_c* i_stage, int param_2) { /* 8004324C-800432EC .text dStage_infoCreate__Fv */ void dStage_infoCreate() { void* stageRsrc = dComIfG_getStageRes("Stage", "stage.dzs"); - JUT_ASSERT(3834, stageRsrc != 0) + JUT_ASSERT(3834, stageRsrc != NULL) dStage_dt_c_stageInitLoader(stageRsrc, &dComIfGp_getStage()); } @@ -2163,7 +2163,7 @@ void dStage_Create() { dKankyo_create(); void* stageRsrc = dComIfG_getStageRes("Stage", "stage.dzs"); - JUT_ASSERT(3862, stageRsrc != 0) + JUT_ASSERT(3862, stageRsrc != NULL) dComIfGp_roomControl_init(); dStage_dt_c_stageLoader(stageRsrc, &dComIfGp_getStage()); |