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_stone.cpp
+17 -17
View File
@@ -212,7 +212,7 @@ int daObjStone_c::Create() {
pos.y += 1.0f;
// Create the mark actor that goes under the stone
fopAcM_createChild(PROC_Obj_StoneMark, fopAcM_GetID(this), stoneType, &pos,
fopAcM_createChild(fpcNm_Obj_StoneMark_e, fopAcM_GetID(this), stoneType, &pos,
fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, 0);
mSound.init(&current.pos, 1);
@@ -299,7 +299,7 @@ void daObjStone_c::mode_proc_call() {
cCcD_Obj* tgHitObj = mCollider.GetTgHitObj();
if (tgHitObj != NULL) {
fopAc_ac_c* tgHitActor = mCollider.GetTgHitAc();
if (fopAcM_GetName(tgHitActor) == PROC_OBJ_GRA) {
if (fopAcM_GetName(tgHitActor) == fpcNm_OBJ_GRA_e) {
init_modeBreak();
} else {
if (tgHitObj->ChkAtType(AT_TYPE_BOMB)) {
@@ -308,7 +308,7 @@ void daObjStone_c::mode_proc_call() {
if (tgHitObj->ChkAtType(AT_TYPE_IRON_BALL) && tgHitObj->GetAtAtp() != 1) {
init_modeBreak();
} else if (tgHitObj->ChkAtType(AT_TYPE_CSTATUE_SWING) &&
(fopAcM_GetName(tgHitActor) == PROC_Obj_VolcanicBomb))
(fopAcM_GetName(tgHitActor) == fpcNm_Obj_VolcanicBomb_e))
{
init_modeBreak();
}
@@ -1022,18 +1022,18 @@ static actor_method_class l_daObjStone_Method = {
};
actor_process_profile_definition g_profile_Obj_Stone = {
fpcLy_CURRENT_e, // mLayerID
8, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_Stone, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daObjStone_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
511, // mPriority
&l_daObjStone_Method, // sub_method
0x40100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLSPHERE_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 8,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Obj_Stone_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daObjStone_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Obj_Stone_e,
/* Actor SubMtd */ &l_daObjStone_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e,
};