mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-24 23:53:12 -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_obj_so.cpp
+18 -18
View File
@@ -65,7 +65,7 @@ static void ride_call_back_1(dBgW* i_BgW, fopAc_ac_c* a_this, fopAc_ac_c* param_
static void so_hasira(obj_so_class* i_this) {
fopAc_ac_c* a_this = &i_this->actor;
daPillar_c* pillar_p = (daPillar_c*)fopAcM_SearchByName(PROC_Obj_Pillar);
daPillar_c* pillar_p = (daPillar_c*)fopAcM_SearchByName(fpcNm_Obj_Pillar_e);
if (pillar_p != NULL) {
mDoMtx_stack_c::transS(pillar_p->current.pos.x, pillar_p->current.pos.y, pillar_p->current.pos.z);
mDoMtx_stack_c::YrotM(pillar_p->mRotY);
@@ -849,10 +849,10 @@ static void demo_camera(obj_so_class* i_this) {
cXyz sp48(-4264.0f, 302.0f, -2330.0f);
cXyz sp54(16400.0f, 3529.0f, 8385.0f);
sp54 += sp48;
fpc_ProcID i_parentID = fopAcM_create(PROC_E_OC, 0xFFFF0103, &sp54, fopAcM_GetRoomNo(a_this), &i_angle, 0, -1);
fpc_ProcID i_parentID = fopAcM_create(fpcNm_E_OC_e, 0xFFFF0103, &sp54, fopAcM_GetRoomNo(a_this), &i_angle, 0, -1);
sp54.set(16200.0f, 3481.0f, 8418.0f);
sp54 += sp48;
fopAcM_createChild(PROC_E_OC, i_parentID, 0xFFFF0104, &sp54, fopAcM_GetRoomNo(a_this), &i_angle, NULL, -1, NULL);
fopAcM_createChild(fpcNm_E_OC_e, i_parentID, 0xFFFF0104, &sp54, fopAcM_GetRoomNo(a_this), &i_angle, NULL, -1, NULL);
} else if (i_this->field_0x1ba2 == 125) {
i_this->mDemoMode = 100;
}
@@ -1063,7 +1063,7 @@ static int daObj_So_Create(fopAc_ac_c* a_this) {
i_this->field_0xdae = 3;
if (fopAcM_GetRoomNo(a_this) == 4) {
cXyz sp2c(-5374.0f, 4280.0f, -2342.0f);
i_this->field_0x1b94 = fopAcM_create(PROC_OBJ_GM, 0x600, &sp2c, fopAcM_GetRoomNo(a_this),
i_this->field_0x1b94 = fopAcM_create(fpcNm_OBJ_GM_e, 0x600, &sp2c, fopAcM_GetRoomNo(a_this),
NULL, NULL, -1);
}
}
@@ -1089,18 +1089,18 @@ static actor_method_class l_daObj_So_Method = {
};
actor_process_profile_definition g_profile_OBJ_SO = {
fpcLy_CURRENT_e, // mLayerID
2, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_OBJ_SO, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(obj_so_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
55, // mPriority
&l_daObj_So_Method, // sub_method
0x00044000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 2,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_OBJ_SO_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(obj_so_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_OBJ_SO_e,
/* Actor SubMtd */ &l_daObj_So_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};