summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_obj_coming.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_coming.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_coming.cpp')
-rw-r--r--src/d/actor/d_a_obj_coming.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/d/actor/d_a_obj_coming.cpp b/src/d/actor/d_a_obj_coming.cpp
index b41a8b5f..5da8c48f 100644
--- a/src/d/actor/d_a_obj_coming.cpp
+++ b/src/d/actor/d_a_obj_coming.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_actor_mng.h"
dBgS_ObjGndChk daObjComing::Act_c::M_gnd_work;
@@ -334,7 +332,7 @@ void* daObjComing::Act_c::chk_make_pos_act(void* actor, void* data) {
if (fopAc_IsActor(i_this)) {
s16 proc = fopAcM_GetName(i_this);
- if (proc != PROC_SHIP && proc != PROC_PLAYER && (std::fabsf(i_this->current.pos.y - tmp->m0C.y) < tmp->m1C + 100.0f)) {
+ if (proc != fpcNm_SHIP_e && proc != fpcNm_PLAYER_e && (std::fabsf(i_this->current.pos.y - tmp->m0C.y) < tmp->m1C + 100.0f)) {
if (i_this->current.pos.absXZ(tmp->m0C) < tmp->m18 + 100.0f) {
return i_this;
}
@@ -571,18 +569,18 @@ static actor_method_class Mthd_Table = {
}; // namespace daObjComing
actor_process_profile_definition g_profile_Obj_Coming = {
- /* LayerID */ fpcLy_CURRENT_e,
- /* ListID */ 0x0007,
- /* ListPrio */ fpcPi_CURRENT_e,
- /* ProcName */ PROC_Obj_Coming,
+ /* Layer ID */ fpcLy_CURRENT_e,
+ /* List ID */ 0x0007,
+ /* List Prio */ fpcPi_CURRENT_e,
+ /* Proc Name */ fpcNm_Obj_Coming_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daObjComing::Act_c),
- /* SizeOther */ 0,
+ /* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
- /* Priority */ PRIO_Obj_Coming,
+ /* Draw Prio */ fpcDwPi_Obj_Coming_e,
/* Actor SubMtd */ &daObjComing::Mthd_Table,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
- /* CullType */ fopAc_CULLBOX_0_e,
+ /* Cull Type */ fopAc_CULLBOX_0_e,
};