diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-05-26 00:11:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-26 00:11:58 -0400 |
| commit | 102042628fa139f4e509251bdd9095493f031e28 (patch) | |
| tree | a5b37fcd76d8c0105f2e9b379b7e2daa7eae2266 /src/d/actor/d_a_obj_barrel2.cpp | |
| parent | 79277cb2b2672104b87172d8ff620f923f450658 (diff) | |
Process profiles and enums cleanup (#1031)
* Fix some profile comments
* Add missing static for local visibility data
* Move proc name and draw priority enums to f_pc
* Add _e suffix to daObjBarrier_c proc enum
* Change proc name enum format to match TP
* Change draw prio enum format to match TP
* Change ItemNo enum format, finish fixing item names
* Revert static for cb1 hio
* Clean up formatting of profile comments
* Fix comment alignment
Diffstat (limited to 'src/d/actor/d_a_obj_barrel2.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_barrel2.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/d/actor/d_a_obj_barrel2.cpp b/src/d/actor/d_a_obj_barrel2.cpp index a1d98c86..8cac21ed 100644 --- a/src/d/actor/d_a_obj_barrel2.cpp +++ b/src/d/actor/d_a_obj_barrel2.cpp @@ -10,8 +10,6 @@ #include "d/actor/d_a_sea.h" #include "d/actor/d_a_ship.h" #include "d/d_com_inf_game.h" -#include "d/d_priority.h" -#include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_kankyo_mng.h" @@ -327,7 +325,7 @@ void daObjBarrel2::Act_c::tg_hitCB(fopAc_ac_c* a_this, dCcD_GObjInf* arg2, fopAc void daObjBarrel2::Act_c::co_hitCB(fopAc_ac_c* a_this, dCcD_GObjInf*, fopAc_ac_c* a_ship, dCcD_GObjInf*) { daObjBarrel2::Act_c* i_this = (daObjBarrel2::Act_c*)a_this; - if (fopAcM_GetProfName(a_ship) == PROC_SHIP) { + if (fopAcM_GetProfName(a_ship) == fpcNm_SHIP_e) { daShip_c* ship = (daShip_c*)a_ship; const s32 index = i_this->m410; @@ -1142,18 +1140,18 @@ actor_method_class daObjBarrel2::Method::Table = { }; actor_process_profile_definition g_profile_Obj_Barrel2 = { - /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 0x0008, - /* ListPrio */ fpcPi_CURRENT_e, - /* ProcName */ PROC_Obj_Barrel2, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0x0008, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Barrel2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, /* Size */ sizeof(daObjBarrel2::Act_c), - /* SizeOther */ 0, + /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ PRIO_Obj_Barrel2, + /* Draw Prio */ fpcDwPi_Obj_Barrel2_e, /* Actor SubMtd */ &daObjBarrel2::Method::Table, /* Status */ 0x05 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, /* Group */ fopAc_ACTOR_e, - /* CullType */ fopAc_CULLSPHERE_CUSTOM_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; |