mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-19 05:22:39 -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_tbox.cpp
+5 -5
View File
@@ -95,7 +95,7 @@ s32 daTbox_c::commonShapeSet() {
// Load model
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", mdlInfo.modelId);
JUT_ASSERT(0xA0, modelData != 0);
JUT_ASSERT(0xA0, modelData != NULL);
u32 modelFlags = 0x11000022;
@@ -176,7 +176,7 @@ s32 daTbox_c::commonShapeSet() {
/* 00000598-00000764 .text effectShapeSet__8daTbox_cFv */
s32 daTbox_c::effectShapeSet() {
J3DModelData* flashModelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", DALWAYS_BDL_IT_TAKARA_FLASH);
JUT_ASSERT(0x117, flashModelData != 0);
JUT_ASSERT(0x117, flashModelData != NULL);
mpFlashMdl = mDoExt_J3DModel__create(flashModelData, 0x80000, 0x1000200);
if (mpFlashMdl == NULL) {
@@ -239,7 +239,7 @@ s32 daTbox_c::bgCheckSet() {
modelInfo& mdlInfo = getModelInfo();
cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes("Dalways", mdlInfo.closedColId);
JUT_ASSERT(0x195, bgd != 0);
JUT_ASSERT(0x195, bgd != NULL);
mpBgWClosed = new dBgW();
if (mpBgWClosed == NULL) {
@@ -251,7 +251,7 @@ s32 daTbox_c::bgCheckSet() {
}
bgd = (cBgD_t*)dComIfG_getObjectRes("Dalways", mdlInfo.openColId);
JUT_ASSERT(0x1A6, bgd != 0);
JUT_ASSERT(0x1A6, bgd != NULL);
mpBgWOpen = new dBgW();
if (mpBgWOpen == NULL) {
@@ -264,7 +264,7 @@ s32 daTbox_c::bgCheckSet() {
if (getFuncType() == FUNC_TYPE_SWITCH_VISIBLE) {
bgd = (cBgD_t*)dComIfG_getObjectRes("Dalways", DALWAYS_DZB_KINB_00);
JUT_ASSERT(0x1B9, bgd != 0);
JUT_ASSERT(0x1B9, bgd != NULL);
mpBgWVines = new dBgW();
if (mpBgWVines == NULL) {