diff options
Diffstat (limited to 'src/d/actor/d_a_obj_bhashi.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_bhashi.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/d/actor/d_a_obj_bhashi.cpp b/src/d/actor/d_a_obj_bhashi.cpp index 42b29b43ae..00a35bc158 100644 --- a/src/d/actor/d_a_obj_bhashi.cpp +++ b/src/d/actor/d_a_obj_bhashi.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_bhashi.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -158,12 +158,12 @@ void daObjBHASHI_c::Obj_Damage() { fopAc_ac_c* tg_hit_obj = dCc_GetAc(mCcCyl.GetTgHitObj()->GetAc()); cXyz* tg_hit_pos = mCcCyl.GetTgHitPosP(); s16 rot_y = cLib_targetAngleY(¤t.pos, tg_hit_pos); - if (fopAcM_GetName(tg_hit_obj) == PROC_B_MGN) { + if (fopAcM_GetName(tg_hit_obj) == fpcNm_B_MGN_e) { field_0x5a8++; - + fpc_ProcID tg_hit_id = fopAcM_GetID(tg_hit_obj); fopAc_ac_c* mgn_p; - if (fopAcM_SearchByName(PROC_B_MGN, &mgn_p) && mgn_p != NULL) { + if (fopAcM_SearchByName(fpcNm_B_MGN_e, &mgn_p) && mgn_p != NULL) { field_0x11dc = cLib_targetAngleY(&fopAcM_GetPosition(mgn_p), ¤t.pos); } @@ -184,7 +184,7 @@ void daObjBHASHI_c::Obj_Damage() { } mCcCyl.ResetTgHit(); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } } } @@ -207,7 +207,7 @@ void daObjBHASHI_c::Obj_Damage(cXyz param_0) { dComIfGp_particle_set(dPa_RM(ID_ZI_S_LV9PILLAR_BREAK_C), &eff_pos, &tevStr, &eff_rot, NULL); dComIfGp_particle_set(dPa_RM(ID_ZI_S_LV9PILLAR_BREAK_D), &eff_pos, &tevStr, &eff_rot, NULL); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } Hahen_c::Hahen_c() { @@ -308,7 +308,7 @@ void Hahen_c::Roll_Set(cXyz* i_pos, f32 param_1, s16 i_no) { f32 speed_x = (-1.0f + nREG_F(12)) * param_1 * cM_ssin(angle); f32 temp_f31 = scale.abs(); temp_f31 = 3.0f / temp_f31; - + f32 speed_y = temp_f30 - 9.0f; f32 speed_z = (-1.0f + nREG_F(13)) * param_1 * cM_scos(angle); @@ -443,7 +443,7 @@ int daObjBHASHI_c::Execute(Mtx** param_0) { } fopAc_ac_c* mgn_p; - if (fopAcM_SearchByName(PROC_B_MGN, &mgn_p) && mgn_p != NULL && ((daB_MGN_c*)mgn_p)->isAppear()) { + if (fopAcM_SearchByName(fpcNm_B_MGN_e, &mgn_p) && mgn_p != NULL && ((daB_MGN_c*)mgn_p)->isAppear()) { Rolling(&fopAcM_GetPosition(mgn_p), 400.0f, 90.0f + yREG_F(0)); } } @@ -503,18 +503,18 @@ static actor_method_class l_daObjBHASHI_Method = { }; actor_process_profile_definition g_profile_Obj_BHASHI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_BHASHI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBHASHI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 463, // mPriority - &l_daObjBHASHI_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BHASHI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBHASHI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BHASHI_e, + /* Actor SubMtd */ &l_daObjBHASHI_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; |
