From 69444ef01e9bfa9e278fa61b44ea9bb4b450cce9 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 30 Dec 2023 15:08:24 -0500 Subject: [PATCH] use enums and inlines in more places --- include/d/d_cc_d.h | 6 +++--- include/d/d_s_play.h | 2 +- src/SSystem/SComponent/c_bg_s.cpp | 4 ++-- src/d/actor/d_a_am2.cpp | 2 +- src/d/actor/d_a_arrow_iceeff.cpp | 2 +- src/d/actor/d_a_arrow_lighteff.cpp | 2 +- src/d/actor/d_a_bomb2.cpp | 2 +- src/d/actor/d_a_bomb3.inc | 2 +- src/d/actor/d_a_boss_item.cpp | 8 ++------ src/d/actor/d_a_fan.cpp | 4 ++-- src/d/actor/d_a_hookshot.cpp | 6 +++--- src/d/actor/d_a_obj_movebox.cpp | 2 +- src/d/actor/d_a_obj_pbka.cpp | 2 +- src/d/actor/d_a_obj_toripost.cpp | 2 +- src/d/actor/d_a_player_main.cpp | 2 +- src/d/actor/d_a_shop_item.cpp | 2 +- src/d/d_attention.cpp | 16 ++++++++-------- src/d/d_cc_d.cpp | 22 +++++++++++----------- src/d/d_com_static.cpp | 10 +++++----- src/d/d_event_data.cpp | 6 +++--- src/d/d_s_play.cpp | 6 +++--- src/d/d_snap.cpp | 4 ++-- src/f_op/f_op_actor_mng.cpp | 18 +++++++++--------- src/f_op/f_op_overlap.cpp | 2 +- src/f_op/f_op_scene_mng.cpp | 10 +++++----- 25 files changed, 70 insertions(+), 74 deletions(-) diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h index 59526b9dd..cb112e473 100644 --- a/include/d/d_cc_d.h +++ b/include/d/d_cc_d.h @@ -250,11 +250,11 @@ public: void SetSe(u8 se) { mSe = se; } void SetVec(cXyz& vec) { mVec = vec; } cXyz& GetVec() { return mVec; } - void SetShieldFrontRangeYAngle(s16* angle) { mShieldFrontRangeYAngle = angle; } + void SetShieldFrontRangeYAngle(s16* angle) { mpShieldFrontRangeYAngle = angle; } void SetMtrl(u8 mtrl) { mMtrl = mtrl; } u8 GetMtrl() { return mMtrl; } void SetHitMark(CcG_Tg_HitMark mark) { mHitMark = mark; } - s16* GetShieldFrontRangeYAngle() { return mShieldFrontRangeYAngle; } + s16* GetShieldFrontRangeYAngle() { return mpShieldFrontRangeYAngle; } u8 GetSpl() { return mSpl; } void SetSpl(dCcG_Tg_Spl spl) { mSpl = spl; } u8 GetHitMark() { return mHitMark; } @@ -273,7 +273,7 @@ private: /* 0x20 */ cXyz mVec; /* 0x2C */ cXyz mRVec; /* 0x38 */ cXyz mHitPos; - /* 0x44 */ s16* mShieldFrontRangeYAngle; + /* 0x44 */ s16* mpShieldFrontRangeYAngle; }; // Size = 0x48 // Correction (Co) Collider diff --git a/include/d/d_s_play.h b/include/d/d_s_play.h index b5368bb80..fba08c8cd 100644 --- a/include/d/d_s_play.h +++ b/include/d/d_s_play.h @@ -110,7 +110,7 @@ public: /* 0x09 */ u8 field_0x09; /* 0x0A */ s16 mGroup; /* 0x0C */ s16 mID; - /* 0x10 */ int field_0x10; + /* 0x10 */ u32 field_0x10; }; extern dScnPly_msg_HIO_c g_msgDHIO; diff --git a/src/SSystem/SComponent/c_bg_s.cpp b/src/SSystem/SComponent/c_bg_s.cpp index b25d822ee..0355e87a5 100644 --- a/src/SSystem/SComponent/c_bg_s.cpp +++ b/src/SSystem/SComponent/c_bg_s.cpp @@ -17,7 +17,7 @@ void cBgS_ChkElm::Init() { m_bgw_base_ptr = NULL; m_flags = 0; m_actor_ptr = NULL; - m_actor_id = -1; + m_actor_id = fpcM_ERROR_PROCESS_ID_e; } /* 8024645C-80246478 .text Regist2__11cBgS_ChkElmFP4cBgWUiPv */ @@ -32,7 +32,7 @@ void cBgS_ChkElm::Regist2(cBgW* bgw, unsigned int pid, void* actor) { void cBgS_ChkElm::Release() { m_flags &= ~1; m_bgw_base_ptr = NULL; - m_actor_id = -1; + m_actor_id = fpcM_ERROR_PROCESS_ID_e; m_actor_ptr = NULL; } diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 94255f731..802d45123 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -197,7 +197,7 @@ static BOOL medama_atari_check(am2_class* i_this) { ret = true; if (i_this->mCurrBckIdx == AM2_BCK_SLEEP) { anm_init(i_this, AM2_BCK_WAIT, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); - i_this->mAttentionInfo.mFlags = 4; + i_this->mAttentionInfo.mFlags = fopAc_Attn_LOCKON_ENEMY_e; fopAcM_OnStatus(i_this, fopAcStts_SHOWMAP_e); i_this->mNeedleCyl.OnAtSetBit(); i_this->mNeedleCyl.OnAtHitBit(); diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp index a6165102c..96ef13d6e 100644 --- a/src/d/actor/d_a_arrow_iceeff.cpp +++ b/src/d/actor/d_a_arrow_iceeff.cpp @@ -71,7 +71,7 @@ void daArrow_Iceeff_c::CreateInit() { } fopAcM_setCullSizeBox(this, -100.0f, -100.0f, -100.0f, 100.0f, 100.0f, 100.0f); - mCullSizeFar = 1.0f; + fopAcM_setCullSizeFar(this, 1.0f); set_mtx(); field_0xA30 = 0; field_0xA34 = 0.0f; diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp index 932810da0..fe8efb2fb 100644 --- a/src/d/actor/d_a_arrow_lighteff.cpp +++ b/src/d/actor/d_a_arrow_lighteff.cpp @@ -133,7 +133,7 @@ void daArrow_Lighteff_c::CreateInit() { field_0x2A8.setall(1.0f); fopAcM_setCullSizeBox(this, -100.0f, -100.0f, -100.0f, 100.0f, 100.0f, 100.0f); - mCullSizeFar = 1.0f; + fopAcM_setCullSizeFar(this, 1.0f); set_mtx(); diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index 4c6f788d2..73d59cafa 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -378,7 +378,7 @@ namespace daBomb2 { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -36.0f, 0.0f, -36.0f, 36.0f, 66.0f, 36.0f); - mCullSizeFar = 10.0f; + fopAcM_setCullSizeFar(this, 10.0f); if(daObj::PrmAbstract(this, PRM_1_W, PRM_1_S)) { off_carry(); diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index 8d77c6c89..ad6ceb400 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -1422,7 +1422,7 @@ void daBomb_c::create_init() { mCull.mBox.mMax.x = 36.0f; mCull.mBox.mMax.y = 66.0f; mCull.mBox.mMax.z = 36.0f; - mCullSizeFar = 10.0f; + fopAcM_setCullSizeFar(this, 10.0f); init_mtx(); } diff --git a/src/d/actor/d_a_boss_item.cpp b/src/d/actor/d_a_boss_item.cpp index ef27ae76d..a1839882f 100644 --- a/src/d/actor/d_a_boss_item.cpp +++ b/src/d/actor/d_a_boss_item.cpp @@ -31,12 +31,8 @@ static s32 daBossItem_Create(fopAc_ac_c* i_this) { if (isStageBossDead && !dComIfGs_isStageLife(stageNo)) { fopAcM_createItemForBoss( - &bItem->current.pos, - 1, - bItem->current.roomNo, - &bItem->current.angle, - 0, - 1 + &bItem->current.pos, 1, bItem->current.roomNo, + &bItem->current.angle, NULL, 1 ); } diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index 334247dcb..8e85fb3c3 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -57,7 +57,7 @@ static dCcD_SrcCps l_cps_src = { BOOL daFan_c::Delete() { dComIfG_resDelete(&mPhs, m_arcname[mType]); dComIfG_resDelete(&mWindPhs, m_arcname2); - if (mWindSePId != -1) { + if (mWindSePId != fpcM_ERROR_PROCESS_ID_e) { dLevelSe_c* se = (dLevelSe_c*)fopKyM_SearchByID(mWindSePId); if (se != NULL) fopKyM_Delete(se); @@ -225,7 +225,7 @@ int daFan_c::Execute(Mtx** mtxP) { mWindBtkAnm1.setPlaySpeed(-1.0f); } - if (mWindSePId != -1) { + if (mWindSePId != fpcM_ERROR_PROCESS_ID_e) { dLevelSe_c* se = (dLevelSe_c*)fopKyM_SearchByID(mWindSePId); if (se != NULL) se->setReverb(len * 100.0f, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index c07fa378d..226da8459 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -206,7 +206,7 @@ BOOL daHookshot_c::procWait_init(BOOL playSe) { mCurrProcFunc = &daHookshot_c::procWait; mChainCnt = 0; current.pos = link->getHookshotRootPos(); - mCarryActorID = -1; + mCarryActorID = fpcM_ERROR_PROCESS_ID_e; m2B0 = 0; if (playSe) { mDoAud_seStart(JA_SE_LK_HS_WIND_UP_FIN, &link->current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); @@ -315,11 +315,11 @@ static BOOL daHookshot_IsDelete(daHookshot_c* i_this) { /* 800F2B7C-800F2BF0 .text hookshot_delete__12daHookshot_cFv */ BOOL daHookshot_c::hookshot_delete() { - if (mCarryActorID != -1) { + if (mCarryActorID != fpcM_ERROR_PROCESS_ID_e) { fopAc_ac_c* hooked_actor = fopAcM_SearchByID(mCarryActorID); if (hooked_actor && fopAcM_checkStatus(hooked_actor, fopAcStts_HOOK_CARRY_e)) { fopAcM_cancelHookCarryNow(hooked_actor); - mCarryActorID = -1; + mCarryActorID = fpcM_ERROR_PROCESS_ID_e; } } return TRUE; diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 150c8e37f..254427337 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -1445,7 +1445,7 @@ namespace daObjMovebox { mChildPID = fopAcM_createChild( PROC_Obj_Mkie, fopAcM_GetID(this), mkieParams, &mkiePos, - fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL + fopAcM_GetRoomNo(this), &shape_angle ); } diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp index 909067c8e..af98037a5 100644 --- a/src/d/actor/d_a_obj_pbka.cpp +++ b/src/d/actor/d_a_obj_pbka.cpp @@ -37,7 +37,7 @@ BOOL daObjPbka_c::CreateHeap() { void daObjPbka_c::CreateInit() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f); - mCullSizeFar = 1.0f; + fopAcM_setCullSizeFar(this, 1.0f); set_mtx(); } diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index 1110540e6..2169bb8d5 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -919,7 +919,7 @@ void daObjTpost_c::createInit() { fopAcM_SetMtx(this, mMorf->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -50.0f, 0.0f, -50.0f, 70.0f, 200.0f, 70.0f); - mCullSizeFar = 10.0f; + fopAcM_setCullSizeFar(this, 10.0f); mStts.Init(0xFF, 0xFF, this); mCyl.Set(m_cyl_src); diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 33dec2365..e566aff24 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -4874,7 +4874,7 @@ int phase_1(daPy_lk_c* i_this) { dComIfGp_setLinkPlayer(i_this); fopAcM_setStageLayer(i_this); - i_this->mAttentionInfo.mFlags = 0xFFFFFFFF; + i_this->mAttentionInfo.mFlags = ~0; i_this->mAttentionInfo.mPosition.x = i_this->current.pos.x; i_this->mAttentionInfo.mPosition.y = i_this->current.pos.y + 125.0f; diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 0ae949ad5..7b362cc96 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -76,7 +76,7 @@ void daShopItem_c::CreateInit() { fopAcM_SetMtx(this, field_0x64C); fopAcM_setCullSizeBox(this, -100.0f, 0.0f, -100.0f, 100.0f, 200.0f, 100.0f); if(mDoLib_clipper::mSystemFar > 1.0f) { - mCullSizeFar = 5000.0f / mDoLib_clipper::mSystemFar; + fopAcM_setCullSizeFar(this, 5000.0f / mDoLib_clipper::mSystemFar); } show(); diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index c1d5faeba..bf58ac532 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -47,14 +47,14 @@ dAttention_c::dAttention_c(fopAc_ac_c* player, u32 playerNo) { mLockOnState = 0; field_0x01a = 0; field_0x01b = 0; - mLockOnTargetBsPcID = -1; + mLockOnTargetBsPcID = fpcM_ERROR_PROCESS_ID_e; heap = mDoExt_createSolidHeapFromGameToCurrent(0x3600, 0); JUT_ASSERT(0xb9, heap != 0); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_YAZIRUSHI_01); JUT_ASSERT(0xbe, modelData != 0); - s32 anmColNum = 0; + int anmColNum = 0; for (u32 i = 0; i < 5; i++) { static u16 l_bpkIdx[] = { ALWAYS_BPK_YJ_IN, ALWAYS_BPK_YJ_OUT, ALWAYS_BPK_YJ_SCALE, ALWAYS_BPK_YJ_LOOP, ALWAYS_BPK_YJ_DELETE, @@ -496,15 +496,15 @@ int dAttHint_c::request(fopAc_ac_c* i_actor, int priority) { /* 8009FB58-8009FB70 .text init__10dAttHint_cFv */ void dAttHint_c::init() { - mHintActorID = -1; - field_0x8 = -1; + mHintActorID = fpcM_ERROR_PROCESS_ID_e; + field_0x8 = fpcM_ERROR_PROCESS_ID_e; mPriority = 0x200; } /* 8009FB70-8009FB8C .text proc__10dAttHint_cFv */ void dAttHint_c::proc() { field_0x8 = mHintActorID; - mHintActorID = -1; + mHintActorID = fpcM_ERROR_PROCESS_ID_e; mPriority = 0x200; } @@ -516,8 +516,8 @@ fopAc_ac_c* dAttCatch_c::convPId(unsigned int i_procID) { /* 8009FBBC-8009FBDC .text init__11dAttCatch_cFv */ void dAttCatch_c::init() { field_0xc = 0x56; - field_0x0 = -1; - mCatghTargetID = -1; + field_0x0 = fpcM_ERROR_PROCESS_ID_e; + mCatghTargetID = fpcM_ERROR_PROCESS_ID_e; field_0x4 = 3; } @@ -525,7 +525,7 @@ void dAttCatch_c::init() { void dAttCatch_c::proc() { mCatghTargetID = field_0x0; mChangeItem = field_0xc; - field_0x0 = -1; + field_0x0 = fpcM_ERROR_PROCESS_ID_e; field_0x4 = 3; field_0xc = 0x56; } diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp index ff3216da1..4591b90b2 100644 --- a/src/d/d_cc_d.cpp +++ b/src/d/d_cc_d.cpp @@ -33,10 +33,10 @@ dCcD_GStts::dCcD_GStts() { mTgSpl = 0; mRoomId = 0; mActorPerfTblId = -1; - mAtApid = -1; - mAtOldApid = -1; - mTgApid = -1; - mTgOldApid = -1; + mAtApid = fpcM_ERROR_PROCESS_ID_e; + mAtOldApid = fpcM_ERROR_PROCESS_ID_e; + mTgApid = fpcM_ERROR_PROCESS_ID_e; + mTgOldApid = fpcM_ERROR_PROCESS_ID_e; field_0x1C = 0; } @@ -46,19 +46,19 @@ void dCcD_GStts::Ct() { mTgSpl = 0; mRoomId = 0; mActorPerfTblId = -1; - mAtApid = -1; - mAtOldApid = -1; - mTgApid = -1; - mTgOldApid = -1; + mAtApid = fpcM_ERROR_PROCESS_ID_e; + mAtOldApid = fpcM_ERROR_PROCESS_ID_e; + mTgApid = fpcM_ERROR_PROCESS_ID_e; + mTgOldApid = fpcM_ERROR_PROCESS_ID_e; field_0x1C = 0; } /* 800AB3BC-800AB3DC .text Move__10dCcD_GSttsFv */ void dCcD_GStts::Move() { mAtOldApid = mAtApid; - mAtApid = NULL; + mAtApid = 0; mTgOldApid = mTgApid; - mTgApid = NULL; + mTgApid = 0; } /* 800AB3DC-800AB46C .text Init__9dCcD_SttsFiiP10fopAc_ac_c */ @@ -108,7 +108,7 @@ void dCcD_GObjTg::Set(const dCcD_SrcGObjTg& src) { mHitMark = src.mHitMark; mSpl = src.mSpl; mHitPos = cXyz::Zero; - mShieldFrontRangeYAngle = NULL; + mpShieldFrontRangeYAngle = NULL; } /* 800AB520-800AB63C .text __ct__12dCcD_GObjInfFv */ diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index cf3688259..5ca7177af 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -148,14 +148,14 @@ u32 daIball_c::m_ib_actor[5]; /* 800568D0-800568F8 .text init__9daIball_cFv */ void daIball_c::init() { for (int i = 0; i < ARRAY_SIZE(m_ib_actor); i++) { - m_ib_actor[i] = -1; + m_ib_actor[i] = fpcM_ERROR_PROCESS_ID_e; } } /* 800568F8-80056944 .text regist__9daIball_cFP10fopAc_ac_c */ void daIball_c::regist(fopAc_ac_c* i_actor) { for (int i = 0; i < ARRAY_SIZE(m_ib_actor); i++) { - if (m_ib_actor[i] == -1) { + if (m_ib_actor[i] == fpcM_ERROR_PROCESS_ID_e) { m_ib_actor[i] = fopAcM_GetID(i_actor); break; } @@ -166,7 +166,7 @@ void daIball_c::regist(fopAc_ac_c* i_actor) { void daIball_c::remove(fopAc_ac_c* i_actor) { for (int i = 0; i < ARRAY_SIZE(m_ib_actor); i++) { if (m_ib_actor[i] == fopAcM_GetID(i_actor)) { - m_ib_actor[i] = -1; + m_ib_actor[i] = fpcM_ERROR_PROCESS_ID_e; break; } } @@ -174,9 +174,9 @@ void daIball_c::remove(fopAc_ac_c* i_actor) { /* 80056990-80056A18 .text remove_old__9daIball_cFv */ void daIball_c::remove_old() { - u32 iball_id = -1; + u32 iball_id = fpcM_ERROR_PROCESS_ID_e; for (int i = 0; i < ARRAY_SIZE(m_ib_actor); i++) { - if (m_ib_actor[i] == -1) { + if (m_ib_actor[i] == fpcM_ERROR_PROCESS_ID_e) { return; } if (m_ib_actor[i] < iball_id) { diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index 0d5bee765..7f818f196 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -281,7 +281,7 @@ void dEvDtStaff_c::specialProcMessage() { specialProc_WaitStart(staffIdx); break; case 1: // CREATE_MSG - l_msgId = -1; + l_msgId = fpcM_ERROR_PROCESS_ID_e; l_msg = NULL; u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "msgNo"); JUT_ASSERT(0x1D2, idata); @@ -322,7 +322,7 @@ void dEvDtStaff_c::specialProcMessage() { switch (mWipeDirection) { case 0: l_msgId = fopMsgM_messageSet(l_msgNo); - if (l_msgId != -1) { + if (l_msgId != fpcM_ERROR_PROCESS_ID_e) { mWipeDirection++; } break; @@ -349,7 +349,7 @@ void dEvDtStaff_c::specialProcMessage() { dComIfGp_evmng_cutEnd(staffIdx); } else if (l_msg->mMode == 0x12) { l_msg->mMode = 0x13; - l_msgId = -1; + l_msgId = fpcM_ERROR_PROCESS_ID_e; l_msg = NULL; dComIfGp_evmng_cutEnd(staffIdx); } diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index ba9fdd714..12fa352f0 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -128,7 +128,7 @@ dScnPly_msg_HIO_c::dScnPly_msg_HIO_c() { field_0x09 = 0; mGroup = 0; mID = 1; - field_0x10 = -1; + field_0x10 = fpcM_ERROR_PROCESS_ID_e; } dScnPly_msg_HIO_c g_msgDHIO; @@ -228,7 +228,7 @@ void dScnPly_msg_HIO_c::dScnPly_msg_HIO_messageProc() { dScnPly_msg_HIO_padCheck(); if (field_0x06) { - if (field_0x10 == 0xFFFFFFFF) { + if (field_0x10 == fpcM_ERROR_PROCESS_ID_e) { u32 msg_num = (mGroup << 0x10) | mID; cXyz sp10(0.0f, 0.0f, 0.0f); @@ -246,7 +246,7 @@ void dScnPly_msg_HIO_c::dScnPly_msg_HIO_messageProc() { msg_p->mMode = 16; } else if (msg_p->mMode == 18) { msg_p->mMode = 19; - field_0x10 = -1; + field_0x10 = fpcM_ERROR_PROCESS_ID_e; field_0x06 = 0; mID++; } diff --git a/src/d/d_snap.cpp b/src/d/d_snap.cpp index 4f8f396a3..38f33f91e 100644 --- a/src/d/d_snap.cpp +++ b/src/d/d_snap.cpp @@ -4,7 +4,7 @@ // #include "d/d_snap.h" -#include "dolphin/types.h" +#include "f_pc/f_pc_manager.h" void (dSnap_packet::*dSnap_packet::m_judge_tbl[])() = { NULL, @@ -33,7 +33,7 @@ void dSnap_GetFigRoomId(int) { /* 800CD00C-800CD068 .text __ct__9dSnap_ObjFv */ dSnap_Obj::dSnap_Obj() { - mBsPcId = -1; + mBsPcId = fpcM_ERROR_PROCESS_ID_e; field_0x18 = 0; field_0x19 = 4; field_0x1a = -1; diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 656e49fe2..6f3f1abc4 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -82,7 +82,7 @@ fopAcM_prm_class* fopAcM_CreateAppend() { params->mScale.x = 10; params->mScale.y = 10; params->mScale.z = 10; - params->mParentPcId = -1; + params->mParentPcId = fpcM_ERROR_PROCESS_ID_e; params->mSubtype = -1; } return params; @@ -150,7 +150,7 @@ s32 fopAcM_delete(unsigned int actorID) { /* 8002451C-80024598 .text fopAcM_create__FsUlP4cXyziP5csXyzP4cXyzScPFPv_i */ s32 fopAcM_create(s16 procName, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc) { - fopAcM_prm_class* params = createAppend(parameter, pPos, roomNo, pAngle, pScale, subtype, 0xFFFFFFFF); + fopAcM_prm_class* params = createAppend(parameter, pPos, roomNo, pAngle, pScale, subtype, fpcM_ERROR_PROCESS_ID_e); if (params == NULL) return -1; @@ -168,7 +168,7 @@ s32 fopAcM_create(char* pProcNameString, u32 parameter, cXyz* pPos, int roomNo, /* 80024614-8002468C .text fopAcM_fastCreate__FsUlP4cXyziP5csXyzP4cXyzScPFPv_iPv */ void* fopAcM_fastCreate(s16 procName, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc, void* pUserData) { - fopAcM_prm_class* params = createAppend(parameter, pPos, roomNo, pAngle, pScale, subtype, 0xFFFFFFFF); + fopAcM_prm_class* params = createAppend(parameter, pPos, roomNo, pAngle, pScale, subtype, fpcM_ERROR_PROCESS_ID_e); if (params == NULL) return NULL; @@ -580,12 +580,12 @@ s32 fopAcM_cullingCheck(fopAc_ac_c* i_this) { pMtx = mtx; } - f32 cullFar = i_this->mCullSizeFar; + f32 cullFar = fopAcM_getCullSizeFar(i_this); if (dComIfGp_event_runCheck()) { cullFar *= dComIfGp_event_getCullRate(); } - int cullType = i_this->mCullType; + int cullType = fopAcM_GetCullSize(i_this); bool isBox = false; if ((cullType >= 0 && cullType < fopAc_CULLBOX_CUSTOM_e) || cullType == fopAc_CULLBOX_CUSTOM_e) { isBox = true; @@ -593,7 +593,7 @@ s32 fopAcM_cullingCheck(fopAc_ac_c* i_this) { if (isBox) { if (cullType == fopAc_CULLBOX_CUSTOM_e) { - if (i_this->mCullSizeFar > 0.0f) { + if (fopAcM_getCullSizeFar(i_this) > 0.0f) { mDoLib_clipper::mClipper.setFar(cullFar * mDoLib_clipper::mSystemFar); mDoLib_clipper::mClipper.calcViewFrustum(); s32 ret = mDoLib_clipper::mClipper.clip(pMtx, &i_this->mCull.mBox.mMax, &i_this->mCull.mBox.mMin); @@ -605,7 +605,7 @@ s32 fopAcM_cullingCheck(fopAc_ac_c* i_this) { } } else { fopAc_cullSizeBox& cullBox = l_cullSizeBox[cullType]; - if (i_this->mCullSizeFar > 0.0f) { + if (fopAcM_getCullSizeFar(i_this) > 0.0f) { mDoLib_clipper::mClipper.setFar(cullFar * mDoLib_clipper::mSystemFar); mDoLib_clipper::mClipper.calcViewFrustum(); s32 ret = mDoLib_clipper::mClipper.clip(pMtx, &cullBox.mMax, &cullBox.mMin); @@ -618,7 +618,7 @@ s32 fopAcM_cullingCheck(fopAc_ac_c* i_this) { } } else { // Sphere if (cullType == fopAc_CULLSPHERE_CUSTOM_e) { - if (i_this->mCullSizeFar > 0.0f) { + if (fopAcM_getCullSizeFar(i_this) > 0.0f) { mDoLib_clipper::mClipper.setFar(cullFar * mDoLib_clipper::mSystemFar); mDoLib_clipper::mClipper.calcViewFrustum(); f32 radius = i_this->mCull.mSphere.mRadius; @@ -634,7 +634,7 @@ s32 fopAcM_cullingCheck(fopAc_ac_c* i_this) { } } else { fopAc_cullSizeSphere& cullSphere = l_cullSizeSphere[cullType - fopAc_CULLSPHERE_0_e]; - if (i_this->mCullSizeFar > 0.0f) { + if (fopAcM_getCullSizeFar(i_this) > 0.0f) { mDoLib_clipper::mClipper.setFar(cullFar * mDoLib_clipper::mSystemFar); mDoLib_clipper::mClipper.calcViewFrustum(); f32 radius = cullSphere.mRadius; diff --git a/src/f_op/f_op_overlap.cpp b/src/f_op/f_op_overlap.cpp index 4894d3e77..e6b0800db 100644 --- a/src/f_op/f_op_overlap.cpp +++ b/src/f_op/f_op_overlap.cpp @@ -36,7 +36,7 @@ static s32 fopOvlp_Create(void* i_ovlp) { cReq_Create(&i_this->mRq, 1); i_this->mSubMtd = profile->mSubMtd; - i_this->mScenePId = -1; + i_this->mScenePId = fpcM_ERROR_PROCESS_ID_e; } return fpcMtd_Create((process_method_class*)i_this->mSubMtd, i_this); diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp index 465c88600..fdc315286 100644 --- a/src/f_op/f_op_scene_mng.cpp +++ b/src/f_op/f_op_scene_mng.cpp @@ -13,12 +13,12 @@ scene_class* fopScnM_SearchByID(unsigned int id) { return (scene_class*)fopScnIt_Judge((fop_ScnItFunc)fpcSch_JudgeByID, &id); } -static u32 l_scnRqID = 0xFFFFFFFF; +static u32 l_scnRqID = fpcM_ERROR_PROCESS_ID_e; int fopScnM_ChangeReq(scene_class* i_scene, s16 procName, s16 fadeTime, u16 param_4) { u32 sceneRequestID = fopScnRq_Request(2, i_scene, procName, 0, fadeTime, param_4); - if (sceneRequestID == 0xFFFFFFFF) { + if (sceneRequestID == fpcM_ERROR_PROCESS_ID_e) { return 0; } @@ -28,16 +28,16 @@ int fopScnM_ChangeReq(scene_class* i_scene, s16 procName, s16 fadeTime, u16 para unsigned int fopScnM_DeleteReq(scene_class* i_scene) { u32 sceneRequestID = fopScnRq_Request(1, i_scene, 0x7FFF, 0, 0x7FFF, 0); - return sceneRequestID != 0xFFFFFFFF; + return sceneRequestID != fpcM_ERROR_PROCESS_ID_e; } int fopScnM_CreateReq(s16 param_1, s16 param_2, u16 param_3, u32 param_4) { u32 sceneRequestID = fopScnRq_Request(0, 0, param_1, (void*)param_4, param_2, param_3); - return sceneRequestID != 0xFFFFFFFF; + return sceneRequestID != fpcM_ERROR_PROCESS_ID_e; } u32 fopScnM_ReRequest(s16 param_1, u32 param_2) { - if (l_scnRqID == 0xFFFFFFFF) { + if (l_scnRqID == fpcM_ERROR_PROCESS_ID_e) { return 0; }