mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-11 05:08:39 -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_df.cpp
+18 -18
View File
@@ -492,7 +492,7 @@ void daE_DF_c::SearchAction() {
daObjCarry_c* obj_carry = (daObjCarry_c*)fpcM_Search(s_obj_sub, this);
if (obj_carry != NULL) {
if (fopAcM_GetName(obj_carry) == PROC_Obj_Carry) {
if (fopAcM_GetName(obj_carry) == fpcNm_Obj_Carry_e) {
mEatObjType = EAT_TYPE_OBJ;
mCarryType = obj_carry->getType();
fopAcM_delete(obj_carry);
@@ -500,14 +500,14 @@ void daE_DF_c::SearchAction() {
Set_Angle(obj_pos);
mAction = ACT_EAT;
} else if (fopAcM_GetName(obj_carry) == PROC_ALINK && mTimer == 0) {
} else if (fopAcM_GetName(obj_carry) == fpcNm_ALINK_e && mTimer == 0) {
mEatObjType = EAT_TYPE_LINK;
Set_Angle(player_pos);
mTargetAngle = cLib_targetAngleY(&current.pos, player_pos);
mAction = ACT_EAT;
dComIfGp_getVibration().StartShock(5, 0x1f, cXyz(0.0f, 1.0f, 0.0f));
} else if (fopAcM_GetName(obj_carry) == PROC_NBOMB) {
} else if (fopAcM_GetName(obj_carry) == fpcNm_NBOMB_e) {
cXyz* obj_pos = &fopAcM_GetPosition(obj_carry);
Set_Angle(obj_pos);
mEatObjType = EAT_TYPE_BOMB;
@@ -697,7 +697,7 @@ int daE_DF_c::Create() {
}
}
fopAcM_OffStatus(this, 0x4000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e);
daE_DF_Execute(this);
}
@@ -717,18 +717,18 @@ static actor_method_class l_daE_DF_Method = {
};
actor_process_profile_definition g_profile_E_DF = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_DF, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daE_DF_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
130, // mPriority
&l_daE_DF_Method, // sub_method
0x00040100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_DF_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daE_DF_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_DF_e,
/* Actor SubMtd */ &l_daE_DF_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};