summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_disappear.cpp
diff options
context:
space:
mode:
authorHuitzi <73550465+marwernerh@users.noreply.github.com>2026-03-09 21:33:31 -0400
committerGitHub <noreply@github.com>2026-03-09 18:33:31 -0700
commit0b0fdd1f60193d1e3e610326cc2cf2a7b558d366 (patch)
treea39b648ba460b5f80dad748690fa43f6f780e5a6 /src/d/actor/d_a_disappear.cpp
parent30e839c28be83fb07bfbe008d3eb9eb9127e3801 (diff)
Actor status consolidation & process profile definition editing (#3117)
* Consolidate fopAcM_STATUS into fopAc_Status_e * Add _e suffix to fopAcStts enums * Prepare for profile enumeration * Correct typo in scene_process_profile_definition * Manually handle g_profile_Obj_DamCps (inline preprocessing) * Correct g_profile_TAG_LV5SOUP procname to enum * Create d_priority.h * Update process profile definitions * Moved inline comments to the left * Add missing fopAcStts enums * Add d_priority.h include in f_pc_leaf.h * Manually update d_a_obj_damCps profile * Replace fopAcStts enums replacing and anticipatory profile size correction * Changed profile size from literal to sizeof() in anticipation of PR #3116 * Provided putative names to staff-related status enums * Replaced appropriate literals with fopAcStts enums * Fix borked merge * Rename item number enums and move to d_item_data.h * Rename process profile name & draw priority enums * Move process profile name & draw priority enums to appropriate files * Moved fpcNm_ enums from d/d_procname.h to f_pc/f_pc_name.h * Moved fpcDwPi_ enums from d/d_priority.h to f_pc/f_pc_draw_priority.h * ACTUALLY (whoops) stage merge * Correct item mistranslation Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com> --------- Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
Diffstat (limited to 'src/d/actor/d_a_disappear.cpp')
-rw-r--r--src/d/actor/d_a_disappear.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp
index 48efd5a3ce..2aec26258f 100644
--- a/src/d/actor/d_a_disappear.cpp
+++ b/src/d/actor/d_a_disappear.cpp
@@ -7,7 +7,7 @@
#include "d/actor/d_a_disappear.h"
#include "d/d_com_inf_game.h"
-#include "d/d_procname.h"
+#include "f_pc/f_pc_name.h"
static int daDisappear_Draw(disappear_class* i_this) {
return 1;
@@ -16,7 +16,7 @@ static int daDisappear_Draw(disappear_class* i_this) {
static void* s_ks_sub(void* i_actor, void*) {
fopAc_ac_c* actor_p = (fopAc_ac_c*)i_actor;
- if (fopAcM_IsActor(actor_p) && fopAcM_GetName(actor_p) == PROC_NPC_KS) {
+ if (fopAcM_IsActor(actor_p) && fopAcM_GetName(actor_p) == fpcNm_NPC_KS_e) {
actor_p->health = 1;
}
@@ -123,18 +123,18 @@ static actor_method_class l_daDisappear_Method = {
};
actor_process_profile_definition g_profile_DISAPPEAR = {
- fpcLy_CURRENT_e,
- 7,
- fpcPi_CURRENT_e,
- PROC_DISAPPEAR,
- &g_fpcLf_Method.base,
- sizeof(disappear_class),
- 0,
- 0,
- &g_fopAc_Method.base,
- 725,
- &l_daDisappear_Method,
- 0x44000,
- fopAc_ACTOR_e,
- fopAc_CULLBOX_0_e,
+ /* Layer ID */ fpcLy_CURRENT_e,
+ /* List ID */ 7,
+ /* List Prio */ fpcPi_CURRENT_e,
+ /* Proc Name */ fpcNm_DISAPPEAR_e,
+ /* Proc SubMtd */ &g_fpcLf_Method.base,
+ /* Size */ sizeof(disappear_class),
+ /* Size Other */ 0,
+ /* Parameters */ 0,
+ /* Leaf SubMtd */ &g_fopAc_Method.base,
+ /* Draw Prio */ fpcDwPi_DISAPPEAR_e,
+ /* Actor SubMtd */ &l_daDisappear_Method,
+ /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
+ /* Group */ fopAc_ACTOR_e,
+ /* Cull Type */ fopAc_CULLBOX_0_e,
};