mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-06 01:18:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Actor status consolidation & process profile definition editing (#3117)

Browse Source 
* 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:
Huitzi
2026-03-09 21:33:31 -04:00
committed by GitHub
parent 30e839c28b
commit 0b0fdd1f60
873 changed files with 19721 additions and 18953 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_s1.cpp
+20 -20
View File
@@ -268,7 +268,7 @@ static void* s_last_sub(void* i_actor, void* i_data) {
fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor;
fopAc_ac_c* a_data = (fopAc_ac_c*)i_data;
if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) {
if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) {
e_s1_class* e_data = (e_s1_class*)a_data;
e_s1_class* e_actor = (e_s1_class*)a_actor;
@@ -781,7 +781,7 @@ static void* s_down_sub(void* i_actor, void* i_data) {
fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor;
fopAc_ac_c* a_data = (fopAc_ac_c*)i_data;
if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) {
if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) {
e_s1_class* e_data = (e_s1_class*)a_data;
e_s1_class* e_actor = (e_s1_class*)a_actor;
@@ -805,7 +805,7 @@ static void* s_fail_sub(void* i_actor, void* i_data) {
fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor;
fopAc_ac_c* a_data = (fopAc_ac_c*)i_data;
if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) {
if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) {
e_s1_class* e_data = (e_s1_class*)a_data;
e_s1_class* e_actor = (e_s1_class*)a_actor;
@@ -835,7 +835,7 @@ static void* s_allfail_sub(void* i_actor, void* i_data) {
fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor;
fopAc_ac_c* a_data = (fopAc_ac_c*)i_data;
if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) {
if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) {
e_s1_class* e_data = (e_s1_class*)a_data;
e_s1_class* e_actor = (e_s1_class*)a_actor;
@@ -857,7 +857,7 @@ static void* s_allwakeup_sub(void* i_actor, void* i_data) {
fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor;
fopAc_ac_c* a_data = (fopAc_ac_c*)i_data;
if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) {
if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) {
e_s1_class* e_data = (e_s1_class*)a_data;
e_s1_class* e_actor = (e_s1_class*)a_actor;
@@ -888,7 +888,7 @@ static void* s_posrevise_sub(void* i_actor, void* i_data) {
fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor;
fopAc_ac_c* a_data = (fopAc_ac_c*)i_data;
if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) {
if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) {
e_s1_class* e_data = (e_s1_class*)a_data;
e_s1_class* e_actor = (e_s1_class*)a_actor;
@@ -2250,20 +2250,20 @@ static actor_method_class l_daE_S1_Method = {
};
actor_process_profile_definition g_profile_E_S1 = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_S1, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(e_s1_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
121, // mPriority
&l_daE_S1_Method, // sub_method
0x00040000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_S1_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(e_s1_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_S1_e,
/* Actor SubMtd */ &l_daE_S1_Method,
/* Status */ fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;