From 2db5435315141c5bd4d48da527be98d2f13fa271 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Tue, 23 Jan 2024 04:25:43 -0500 Subject: [PATCH] minor actor cleanup --- include/d/actor/d_a_disappear.h | 2 +- include/d/actor/d_a_obj_ojtree.h | 4 +--- include/d/actor/d_a_sea.h | 8 ++++---- include/f_op/f_op_actor_mng.h | 2 +- src/d/actor/d_a_disappear.cpp | 15 +++++++-------- src/d/actor/d_a_obj_ojtree.cpp | 8 ++++---- src/f_op/f_op_actor_mng.cpp | 4 ++-- 7 files changed, 20 insertions(+), 23 deletions(-) diff --git a/include/d/actor/d_a_disappear.h b/include/d/actor/d_a_disappear.h index 4607b39e5..e29a0369f 100644 --- a/include/d/actor/d_a_disappear.h +++ b/include/d/actor/d_a_disappear.h @@ -7,7 +7,7 @@ class disappear_class : public fopAc_ac_c { public: /* 0x290 */ request_of_phase_process_class mPhase; // Unused - /* 0x298 */ s32 mSwitchNo; + /* 0x298 */ s32 mItemBitNo; /* 0x29C */ s16 mTimer; }; diff --git a/include/d/actor/d_a_obj_ojtree.h b/include/d/actor/d_a_obj_ojtree.h index c34b670db..b2539c118 100644 --- a/include/d/actor/d_a_obj_ojtree.h +++ b/include/d/actor/d_a_obj_ojtree.h @@ -23,11 +23,9 @@ namespace daObjOjtree { BOOL Draw(); public: - /* Place member variables here */ /* 0x2C8 */ request_of_phase_process_class mPhs; /* 0x2D0 */ J3DModel* mpModel; - /* 0x2D4 */ u8 field_0x2d4; - /* 0x2D5 */ u8 field_0x2d5[0x2d7 - 0x2d5]; + /* 0x2D4 */ u8 mLockTimer; }; }; diff --git a/include/d/actor/d_a_sea.h b/include/d/actor/d_a_sea.h index 9e9f82585..c77769a71 100644 --- a/include/d/actor/d_a_sea.h +++ b/include/d/actor/d_a_sea.h @@ -69,10 +69,10 @@ public: void draw(); ~daSea_packet_c() {} - f32 getMinX() {} - f32 getMinZ() {} - f32 getMaxX() {} - f32 getMaxZ() {} + f32 getMinX() { return mDrawMinX; } + f32 getMinZ() { return mDrawMinZ; } + f32 getMaxX() { return mDrawMaxX; } + f32 getMaxZ() { return mDrawMaxZ; } GXTexObj* getSea0TexObj() { return &mTexSea0; } GXTexObj* getSea1TexObj() { return &mTexSea1; } GXTexObj* getYuraTexObj() { return &mTexYura; } diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 3bacb9d2f..1a4aec552 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -540,7 +540,7 @@ BOOL stealItem_CB(void* actor); fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo); -s32 fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health = 0, u8 i_switchNo = -1); +s32 fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health = 0, u8 i_itemBitNo = -1); void fopAcM_setCarryNow(fopAc_ac_c* i_this, BOOL stageLayer); void fopAcM_cancelCarryNow(fopAc_ac_c* i_this); s32 fopAcM_otoCheck(fopAc_ac_c*, f32); diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index bf161a603..bad64fc79 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -42,7 +42,7 @@ static BOOL daDisappear_Execute(disappear_class* i_this) { } } else { - fopAcM_createIball(&i_this->current.pos, i_this->mItemTableIdx, i_this->current.roomNo, &i_this->current.angle, i_this->mSwitchNo); + fopAcM_createIball(&i_this->current.pos, i_this->mItemTableIdx, i_this->current.roomNo, &i_this->current.angle, i_this->mItemBitNo); } } } @@ -102,17 +102,16 @@ static s32 daDisappear_Create(fopAc_ac_c* i_this) { fopAcM_SetupActor(dis, disappear_class); - u32 params = dis->mBase.mParameters; + dis->mHealth = fopAcM_GetParam(dis) & 0xFF; + f32 scale = ((fopAcM_GetParam(dis) >> 8) & 0xFF) * 0.1f; - dis->mHealth = dis->mBase.mParameters & 0xFF; - float scale = ((dis->mBase.mParameters >> 8) & 0xFF) * 0.1f; - - dis->mSwitchNo = (dis->mBase.mParameters >> 0x10) & 0xFF; - if (dis->mSwitchNo == 0xFF) { - dis->mSwitchNo = -1; + dis->mItemBitNo = (fopAcM_GetParam(dis) >> 0x10) & 0xFF; + if (dis->mItemBitNo == 0xFF) { + dis->mItemBitNo = -1; } set_disappear(dis, scale); + return cPhs_COMPLEATE_e; } diff --git a/src/d/actor/d_a_obj_ojtree.cpp b/src/d/actor/d_a_obj_ojtree.cpp index 40fc36de7..df8a85da1 100644 --- a/src/d/actor/d_a_obj_ojtree.cpp +++ b/src/d/actor/d_a_obj_ojtree.cpp @@ -40,7 +40,7 @@ int daObjOjtree::Act_c::Create() { pos.set(current.pos); pos.y += 5000.0f; fopAcM_create(PROC_JBO, 0, &pos, home.roomNo, &shape_angle, NULL, 0xff, NULL); - field_0x2d4 = 2; + mLockTimer = 2; return TRUE; } @@ -73,7 +73,7 @@ s32 daObjOjtree::Act_c::Mthd_Delete() { void daObjOjtree::Act_c::set_mtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); - cMtx_copy(mDoMtx_stack_c::get(), mpModel->mBaseTransformMtx); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); cMtx_copy(mDoMtx_stack_c::get(), M_tmp_mtx); } @@ -85,9 +85,9 @@ void daObjOjtree::Act_c::init_mtx() { /* 000003F4-0000045C .text Execute__Q211daObjOjtree5Act_cFPPA3_A4_f */ int daObjOjtree::Act_c::Execute(Mtx** pMtx) { - if(field_0x2d4 != 0) + if(mLockTimer != 0) { - if (--field_0x2d4 == 0) + if (--mLockTimer == 0) { mpBgW->SetLock(); } diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 4b949b92c..aaddb4dc7 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -1274,8 +1274,8 @@ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { } /* 80027A9C-80027B24 .text fopAcM_createDisappear__FP10fopAc_ac_cP4cXyzUcUcUc */ -s32 fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health, u8 i_switchNo) { - u32 params = (i_switchNo & 0xFF) << 0x10 | (i_scale & 0xFF) << 0x08 | i_health & 0xFF; +s32 fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_health, u8 i_itemBitNo) { + u32 params = (i_itemBitNo & 0xFF) << 0x10 | (i_scale & 0xFF) << 0x08 | i_health & 0xFF; fopAc_ac_c* disappear = (fopAc_ac_c*)fopAcM_fastCreate(PROC_DISAPPEAR, params, p_pos, fopAcM_GetRoomNo(i_actor), &i_actor->current.angle); if (disappear) { disappear->mItemTableIdx = i_actor->mItemTableIdx;