mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 21:18:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use NULL macro in asserts, fix NULL macro to match

Browse Source
This commit is contained in:
LagoLunatic
2024-06-22 11:07:16 -04:00
parent c836c5ca1f
commit f9d40ebad8
159 changed files with 462 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_ferris.cpp
+4 -4
View File
@@ -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)