mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-18 14:25:24 -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 8e2545f2ec
commit 56890c32e8
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_kshutter.cpp
+22 -22
View File
@@ -1,6 +1,6 @@
/**
* @file d_a_obj_kshutter.cpp
*
*
*/
#include "d/dolzel_rel.h" // IWYU pragma: keep
@@ -204,7 +204,7 @@ int daObjKshtr_c::Create() {
}
if (mType == TYPE_V_SHUTTER) {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
fopAcM_OffStatus(this, fopAcStts_CULL_e);
}
initBaseMtx();
@@ -299,7 +299,7 @@ void daObjKshtr_c::initKey() {
uVar1 = 0xFFFFFFFF;
}
mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), uVar1, &sp20, fopAcM_GetRoomNo(this), NULL, &scale, -1, NULL);
mKeyHoleId = fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), uVar1, &sp20, fopAcM_GetRoomNo(this), NULL, &scale, -1, NULL);
}
}
}
@@ -633,7 +633,7 @@ BOOL daObjKshtr_c::openProc() {
default:
return openProc_type2();
case TYPE_L3BOSS:
return openProc_typeL3Boss();
@@ -734,7 +734,7 @@ BOOL daObjKshtr_c::demoJail1() {
mDemoMode = 2;
}
break;
case 2:
anmInit();
mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLOPEN2, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -750,7 +750,7 @@ BOOL daObjKshtr_c::demoJail1() {
mDemoMode = 4;
}
break;
case 4:
break;
}
@@ -776,7 +776,7 @@ BOOL daObjKshtr_c::demoJail2() {
mDemoMode = 2;
}
break;
case 2:
speedF = 0.0f;
mDemoMode = 3;
@@ -804,7 +804,7 @@ BOOL daObjKshtr_c::demoJail11() {
mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLOPEN2, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
offDzb();
break;
case 1:
if (mpBckAnm->play()) {
mDemoMode = 2;
@@ -972,18 +972,18 @@ static actor_method_class daObjKshtr_METHODS = {
};
actor_process_profile_definition g_profile_Obj_Kshutter = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_Kshutter, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daObjKshtr_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
443, // mPriority
&daObjKshtr_METHODS, // sub_method
0x00040100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Obj_Kshutter_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daObjKshtr_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Obj_Kshutter_e,
/* Actor SubMtd */ &daObjKshtr_METHODS,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};