summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_obj_barrel.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2026-05-26 00:11:58 -0400
committerGitHub <noreply@github.com>2026-05-26 00:11:58 -0400
commit102042628fa139f4e509251bdd9095493f031e28 (patch)
treea5b37fcd76d8c0105f2e9b379b7e2daa7eae2266 /src/d/actor/d_a_obj_barrel.cpp
parent79277cb2b2672104b87172d8ff620f923f450658 (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_barrel.cpp')
-rw-r--r--src/d/actor/d_a_obj_barrel.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/d/actor/d_a_obj_barrel.cpp b/src/d/actor/d_a_obj_barrel.cpp
index 274ba9ad..e0141998 100644
--- a/src/d/actor/d_a_obj_barrel.cpp
+++ b/src/d/actor/d_a_obj_barrel.cpp
@@ -9,8 +9,6 @@
#include "d/res/res_ktaru_01.h"
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_kankyo_mng.h"
-#include "d/d_procname.h"
-#include "d/d_priority.h"
#include "d/d_com_inf_game.h"
const char daObjBarrel::Act_c::M_arcname[] = "Ktaru_01";
@@ -585,7 +583,7 @@ bool daObjBarrel::Act_c::damage_cc_proc() {
hitNormal *= l_shape_vec;
mMove.abs2();
fopAc_ac_c* hitActor = mCyl.GetTgHitAc();
- if (hitActor != NULL && fopAcM_GetProfName(hitActor) == PROC_PLAYER) {
+ if (hitActor != NULL && fopAcM_GetProfName(hitActor) == fpcNm_PLAYER_e) {
s16 hitObjAngleY = cM_atan2s(hitNormal.x, hitNormal.z);
f32 f2 = cM_scos(hitActor->shape_angle.y - hitObjAngleY);
if (f2 > 0.0f) {
@@ -767,18 +765,18 @@ actor_method_class daObjBarrel::Method::Table = {
};
actor_process_profile_definition g_profile_Obj_Barrel = {
- /* LayerID */ fpcLy_CURRENT_e,
- /* ListID */ 0x0008,
- /* ListPrio */ fpcPi_CURRENT_e,
- /* ProcName */ PROC_Obj_Barrel,
+ /* Layer ID */ fpcLy_CURRENT_e,
+ /* List ID */ 0x0008,
+ /* List Prio */ fpcPi_CURRENT_e,
+ /* Proc Name */ fpcNm_Obj_Barrel_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daObjBarrel::Act_c),
- /* SizeOther */ 0,
+ /* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
- /* Priority */ PRIO_Obj_Barrel,
+ /* Draw Prio */ fpcDwPi_Obj_Barrel_e,
/* Actor SubMtd */ &daObjBarrel::Method::Table,
/* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e | fopAcStts_UNK8000000_e,
/* Group */ fopAc_ACTOR_e,
- /* CullType */ fopAc_CULLSPHERE_CUSTOM_e,
+ /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e,
};