mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-18 05:08:57 -04:00
Use NULL macro in asserts, fix NULL macro to match
This commit is contained in:
@@ -38,7 +38,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
|
||||
/* 00000118-0000032C .text _createHeap__13daGhostship_cFv */
|
||||
BOOL daGhostship_c::_createHeap() {
|
||||
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BDL_AYUSH));
|
||||
JUT_ASSERT(88, modelData != 0);
|
||||
JUT_ASSERT(88, modelData != NULL);
|
||||
|
||||
mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
|
||||
if(!mpModel) {
|
||||
@@ -46,7 +46,7 @@ BOOL daGhostship_c::_createHeap() {
|
||||
}
|
||||
|
||||
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BTK_AYUSH));
|
||||
JUT_ASSERT(95, btk != 0);
|
||||
JUT_ASSERT(95, btk != NULL);
|
||||
|
||||
if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) {
|
||||
return false;
|
||||
@@ -356,7 +356,7 @@ bool daGhostship_c::_execute() {
|
||||
if(mAlpha == l_HIO.shipAlpha && dist < l_HIO.shipEnterDist && dComIfGs_getEventReg(0x8803) < 3 && !mbEnteredShip) {
|
||||
mDoAud_seStart(JA_SE_LK_WARP_TO_G_SHIP);
|
||||
stage_scls_info_class* scls_data = dComIfGd_getMeshSceneList(current.pos);
|
||||
JUT_ASSERT(463, scls_data != 0)
|
||||
JUT_ASSERT(463, scls_data != NULL)
|
||||
|
||||
u8 startCode = scls_data->mStart;
|
||||
dComIfGs_setEventReg(0xC3FF, scls_data->mRoom);
|
||||
|
||||
Reference in New Issue
Block a user