mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-21 20:54:43 -04:00
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>
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_obj_prop.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "f_pc/f_pc_name.h"
|
||||
|
||||
static bool daObjProp_c_createHeap(fopAc_ac_c* i_this) {
|
||||
return static_cast<daObjProp_c*>(i_this)->createHeap();
|
||||
@@ -100,18 +100,18 @@ static actor_method_class daObjProp_METHODS = {
|
||||
};
|
||||
|
||||
actor_process_profile_definition g_profile_Obj_Prop = {
|
||||
fpcLy_CURRENT_e,
|
||||
7,
|
||||
fpcPi_CURRENT_e,
|
||||
PROC_Obj_Prop,
|
||||
&g_fpcLf_Method.base,
|
||||
sizeof(daObjProp_c),
|
||||
0,
|
||||
0,
|
||||
&g_fopAc_Method.base,
|
||||
737,
|
||||
&daObjProp_METHODS,
|
||||
0x40000,
|
||||
fopAc_ENV_e,
|
||||
fopAc_CULLBOX_CUSTOM_e,
|
||||
/* Layer ID */ fpcLy_CURRENT_e,
|
||||
/* List ID */ 7,
|
||||
/* List Prio */ fpcPi_CURRENT_e,
|
||||
/* Proc Name */ fpcNm_Obj_Prop_e,
|
||||
/* Proc SubMtd */ &g_fpcLf_Method.base,
|
||||
/* Size */ sizeof(daObjProp_c),
|
||||
/* Size Other */ 0,
|
||||
/* Parameters */ 0,
|
||||
/* Leaf SubMtd */ &g_fopAc_Method.base,
|
||||
/* Draw Prio */ fpcDwPi_Obj_Prop_e,
|
||||
/* Actor SubMtd */ &daObjProp_METHODS,
|
||||
/* Status */ fopAcStts_UNK_0x40000_e,
|
||||
/* Group */ fopAc_ENV_e,
|
||||
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user