diff --git a/include/d/d_npc.h b/include/d/d_npc.h index 540776c53..394f66801 100644 --- a/include/d/d_npc.h +++ b/include/d/d_npc.h @@ -134,9 +134,9 @@ private: public: dNpc_EventCut_c() { - mpActor = 0; - mpTalkActor = 0; - mpJntCtrl = 0; + mpActor = NULL; + mpTalkActor = NULL; + mpJntCtrl = NULL; } void setActorInfo(char*, fopAc_ac_c*); @@ -241,7 +241,7 @@ class fopNpc_npc_c : public fopAc_ac_c { public: fopNpc_npc_c() { mCurrMsgBsPcId = fpcM_ERROR_PROCESS_ID_e; - mpCurrMsg = 0; + mpCurrMsg = NULL; } /* 0x290 */ dNpc_JntCtrl_c m_jnt; /* 0x2C4 */ dNpc_EventCut_c mEventCut; diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp index 37a785765..16673b830 100644 --- a/src/JSystem/JFramework/JFWDisplay.cpp +++ b/src/JSystem/JFramework/JFWDisplay.cpp @@ -45,7 +45,7 @@ void JFWDisplay::ctor_subroutine(const _GXRenderModeObj* mode, bool enableAlpha) mpRenderMode = mode != 0 ? mode : JUTVideo::getManager()->getRenderMode(); mGamma = 0; - mpFader = 0; + mpFader = NULL; mFrameRate = 1; mTickRate = 0; mCombinationRatio = 0.0f; diff --git a/src/JSystem/JUtility/JUTNameTab.cpp b/src/JSystem/JUtility/JUTNameTab.cpp index b4039f3aa..0b22ce886 100644 --- a/src/JSystem/JUtility/JUTNameTab.cpp +++ b/src/JSystem/JUtility/JUTNameTab.cpp @@ -23,7 +23,7 @@ void JUTNameTab::setResource(const ResNTAB* pNameTable) { mpStrData = (const char*)(pNameTable->mEntries + mNameNum); } else { mNameNum = 0; - mpStrData = 0; + mpStrData = NULL; } } diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp index af673d3c5..0da560d6e 100644 --- a/src/d/actor/d_a_arrow_iceeff.cpp +++ b/src/d/actor/d_a_arrow_iceeff.cpp @@ -32,7 +32,7 @@ BOOL daArrow_Iceeff_c::CreateHeap() { J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Link", LINK_BDL_GICER01)); JUT_ASSERT(98, modelData != 0); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); - if(mpModel == 0) { + if(mpModel == NULL) { return false; } diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index 886bcbf25..e54007668 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -162,10 +162,10 @@ namespace daBomb2 { void FuseSmokeCB_c::deleteCallBack() { if(mpEmitter) { - mpEmitter->mpEmitterCallBack = 0; + mpEmitter->setEmitterCallBackPtr(NULL); mpEmitter->becomeInvalidEmitter(); } - mpEmitter = 0; + mpEmitter = NULL; } /* 800DD6BC-800DD6C0 .text execute__Q27daBomb213FuseSmokeCB_cFP14JPABaseEmitter */ @@ -228,10 +228,10 @@ namespace daBomb2 { void FuseSparksCB_c::deleteCallBack() { if(mpEmitter) { - mpEmitter->mpEmitterCallBack = 0; + mpEmitter->setEmitterCallBackPtr(NULL); mpEmitter->becomeInvalidEmitter(); } - mpEmitter = 0; + mpEmitter = NULL; } void FuseSparksCB_c::execute(JPABaseEmitter* emitter) { diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index de75e1c91..d841ac1f1 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -783,16 +783,16 @@ int daBomb_c::procExplode_init() { } if(mSmoke.mpEmitter) { - mSmoke.mpEmitter->mpEmitterCallBack = 0; + mSmoke.mpEmitter->setEmitterCallBackPtr(NULL); mSmoke.mpEmitter->becomeInvalidEmitter(); } - mSmoke.mpEmitter = 0; + mSmoke.mpEmitter = NULL; if(mSparks.mpEmitter) { - mSparks.mpEmitter->mpEmitterCallBack = 0; + mSparks.mpEmitter->setEmitterCallBackPtr(NULL); mSparks.mpEmitter->becomeInvalidEmitter(); } - mSparks.mpEmitter = 0; + mSparks.mpEmitter = NULL; mPntLight.mPos = current.pos; mPntLight.mPos.y += 100.0f; @@ -1235,16 +1235,16 @@ static BOOL daBomb_IsDelete(daBomb_c*) { /* 800DC570-800DC67C .text bombDelete__8daBomb_cFv */ bool daBomb_c::bombDelete() { if(mSmoke.mpEmitter) { - mSmoke.mpEmitter->mpEmitterCallBack = 0; + mSmoke.mpEmitter->setEmitterCallBackPtr(NULL); mSmoke.mpEmitter->becomeInvalidEmitter(); } - mSmoke.mpEmitter = 0; + mSmoke.mpEmitter = NULL; if(mSparks.mpEmitter) { - mSparks.mpEmitter->mpEmitterCallBack = 0; + mSparks.mpEmitter->setEmitterCallBackPtr(NULL); mSparks.mpEmitter->becomeInvalidEmitter(); } - mSparks.mpEmitter = 0; + mSparks.mpEmitter = NULL; if(field_0x6F0) { daPy_getPlayerLinkActorClass()->decrementBombCnt(); diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index bd7bc6114..73f327aeb 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -2771,7 +2771,7 @@ BOOL daNpc_Ji1_c::CreateHeap() { 0x11020203 ); - if(field_0x330 == 0 || field_0x330->getModel() == 0) { + if(field_0x330 == NULL || field_0x330->getModel() == NULL) { return false; } @@ -2805,7 +2805,7 @@ BOOL daNpc_Ji1_c::CreateHeap() { ); - if(mpMorf == 0 || mpMorf->getModel() == 0) { + if(mpMorf == NULL || mpMorf->getModel() == NULL) { return false; } diff --git a/src/d/actor/d_a_npc_nz_cut.inc b/src/d/actor/d_a_npc_nz_cut.inc index 9fb851290..8eeec7d8d 100644 --- a/src/d/actor/d_a_npc_nz_cut.inc +++ b/src/d/actor/d_a_npc_nz_cut.inc @@ -191,7 +191,7 @@ void daNpc_Nz_c::cutEatesaProc() { if(pBait) { fopAcM_delete(pBait); - mpBait = 0; + mpBait = NULL; field_0x910 = FLOAT_MAX; } else { @@ -234,7 +234,7 @@ void daNpc_Nz_c::cutEatesaFirstProc() { if(pBait) { if(mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f) && cLib_calcTimer(&field_0x906) == 0) { fopAcM_delete(pBait); - mpBait = 0; + mpBait = NULL; dComIfGp_evmng_cutEnd(field_0x8F4); } } diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index c29b5d935..0201cb043 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -2399,7 +2399,7 @@ static BOOL daNpc_Os_IsDelete(daNpc_Os_c* i_this) { void daNpc_Os_infiniteEcallBack_c::end() { if(mpBaseEmitter) { mpBaseEmitter->becomeInvalidEmitter(); - mpBaseEmitter->setEmitterCallBackPtr(0); + mpBaseEmitter->setEmitterCallBackPtr(NULL); mpBaseEmitter = NULL; } } diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp index b58bb4895..b23f6aa40 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -213,7 +213,7 @@ namespace daObjPaper { void daObjPaper::Act_c::mode_talk2() { if (mpMsg->mStatus == fopMsgStts_BOX_CLOSED_e) { mpMsg->mStatus = fopMsgStts_MSG_DESTROYED_e; - mpMsg = 0; + mpMsg = NULL; mMsgId = fpcM_ERROR_PROCESS_ID_e; dComIfGp_event_reset(); diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index 16c13c828..4418b8e2b 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -92,7 +92,7 @@ BOOL daObjTpost_c::_createHeap() { mMorf = new mDoExt_McaMorf(modelData, 0, 0, 0, -1, 1.0f, 0, -1, 1, 0, 0x80000, 0x11000022); - if(mMorf == 0 || mMorf->getModel() == 0) { + if(mMorf == NULL || mMorf->getModel() == NULL) { return FALSE; } else { @@ -914,7 +914,7 @@ void daObjTpost_c::createInit() { field_0x8F0 = 1; mCurrMsgBsPcId = fpcM_ERROR_PROCESS_ID_e; - mpCurrMsg = 0; + mpCurrMsg = NULL; attention_info.distances[fopAc_Attn_TYPE_TALK_e] = 5; attention_info.distances[fopAc_Attn_TYPE_SPEAK_e] = 6; diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index eac248536..684fa1e9f 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -1404,9 +1404,9 @@ void daPy_lk_c::deleteEquipItem(BOOL param_1) { mpSwordModel1 = NULL; m3454.end(); mpSwordTipStabModel = NULL; - mpCutfBrk = 0; - mpCutfBtk = 0; - mpCutfBpk = 0; + mpCutfBrk = NULL; + mpCutfBtk = NULL; + mpCutfBpk = NULL; offNoResetFlg1(daPyFlg1_UNK200000); } diff --git a/src/d/d_a_bomb_static.cpp b/src/d/d_a_bomb_static.cpp index bd8cb78c5..29826d9b6 100644 --- a/src/d/d_a_bomb_static.cpp +++ b/src/d/d_a_bomb_static.cpp @@ -68,16 +68,16 @@ void daBomb_c::setBombNoEff() { _prm_chk_version(); if(mSmoke.mpEmitter) { - mSmoke.mpEmitter->mpEmitterCallBack = 0; + mSmoke.mpEmitter->setEmitterCallBackPtr(NULL); mSmoke.mpEmitter->becomeInvalidEmitter(); } - mSmoke.mpEmitter = 0; + mSmoke.mpEmitter = NULL; if(mSparks.mpEmitter) { - mSparks.mpEmitter->mpEmitterCallBack = 0; + mSparks.mpEmitter->setEmitterCallBackPtr(NULL); mSparks.mpEmitter->becomeInvalidEmitter(); } - mSparks.mpEmitter = 0; + mSparks.mpEmitter = NULL; } /* 800681CC-80068208 .text setBombRestTime__8daBomb_cFs */ diff --git a/src/d/d_npc.cpp b/src/d/d_npc.cpp index c80e2ec79..a636e4d60 100644 --- a/src/d/d_npc.cpp +++ b/src/d/d_npc.cpp @@ -673,7 +673,7 @@ u16 fopNpc_npc_c::talk(int param_1) { } mCurrMsgBsPcId = fopMsgM_messageSet(mCurrMsgNo, this); - mpCurrMsg = 0; + mpCurrMsg = NULL; } else { if(mpCurrMsg) { diff --git a/src/d/d_npc_event_cut.inc b/src/d/d_npc_event_cut.inc index 0abae7d24..05d4d968c 100644 --- a/src/d/d_npc_event_cut.inc +++ b/src/d/d_npc_event_cut.inc @@ -18,7 +18,7 @@ bool dNpc_EventCut_c::cutProc() { "CONTINUE_TALK" }; - if(mpEvtStaffName == 0 || mpActor == 0) { + if(mpEvtStaffName == NULL || mpActor == NULL) { return false; } else { @@ -177,7 +177,7 @@ void dNpc_EventCut_c::cutTurnToActorProc() { fopAcM_Search((fopAcIt_JudgeFunc)&findActorCallBack, this); } else { - if(mpActorName == 0 || strcmp(mpActorName, "Player") == 0) { + if(mpActorName == NULL || strcmp(mpActorName, "Player") == 0) { mpTargetActor = dComIfGp_getPlayer(0); } else { @@ -202,10 +202,10 @@ void dNpc_EventCut_c::cutTurnToActorProc() { } } - if(mpTargetActor == 0) { + if(mpTargetActor == NULL) { dComIfGp_evmng_cutEnd(mEvtStaffId); } - if(mpActorName == 0 || strcmp(mpActorName, "Player") == 0) { + if(mpActorName == NULL || strcmp(mpActorName, "Player") == 0) { mPos = dNpc_playerEyePos(0.0f) + mOffsetPos; } else { @@ -305,7 +305,7 @@ void dNpc_EventCut_c::cutMoveToActorProc() { fopAcM_Search((fopAcIt_JudgeFunc)&findActorCallBack, this); } else { - if(mpActorName == 0 || strcmp(mpActorName, "Player") == 0) { + if(mpActorName == NULL || strcmp(mpActorName, "Player") == 0) { mpTargetActor = dComIfGp_getPlayer(0); } else { @@ -314,7 +314,7 @@ void dNpc_EventCut_c::cutMoveToActorProc() { } } - if(mpTargetActor == 0) { + if(mpTargetActor == NULL) { dComIfGp_evmng_cutEnd(mEvtStaffId); } @@ -357,7 +357,7 @@ fopAc_ac_c* dNpc_EventCut_c::findActorCallBack(fopAc_ac_c* pActor, void* pData) return pActor; } else { - if(cut->mpActorName == 0) { + if(cut->mpActorName == NULL) { return 0; } else { @@ -598,7 +598,7 @@ void dNpc_EventCut_c::cutContinueTalkStart() { /* 8021E338-8021E444 .text cutTalkMsgStart__15dNpc_EventCut_cFv */ void dNpc_EventCut_c::cutTalkMsgProc() { - if(mpTalkActor == 0 || field_0x52 == 0) { + if(mpTalkActor == NULL || field_0x52 == 0) { dComIfGp_evmng_cutEnd(mEvtStaffId); } else { diff --git a/src/f_op/f_op_overlap_req.cpp b/src/f_op/f_op_overlap_req.cpp index 03afdc6d7..28a36c977 100644 --- a/src/f_op/f_op_overlap_req.cpp +++ b/src/f_op/f_op_overlap_req.cpp @@ -13,7 +13,7 @@ void fopOvlpReq_SetPeektime(overlap_request_class*, u16); static int fopOvlpReq_phase_Done(overlap_request_class* i_this) { if (fpcM_Delete(i_this->mpTask) == 1) { - i_this->mpTask = 0; + i_this->mpTask = NULL; i_this->field_0x4 = 0; i_this->mPeektime = 0; i_this->mIsPeek = 0;