mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-30 15:43:19 -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_crvgate.cpp
+20 -20
View File
@@ -133,7 +133,7 @@ void daObjCRVGATE_c::actionWaitEvent() {
Z2GetAudioMgr()->seStart(Z2SE_OBJ_CRVN_GATE_OPEN, &mPos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
fopAcM_OffStatus(this, 0x100);
fopAcM_OffStatus(this, fopAcStts_CULL_e);
} else {
if (checkOpen() != 0) {
eventInfo.onCondition(4);
@@ -344,8 +344,8 @@ void daObjCRVGATE_c::CloseAction() {
fopAc_ac_c* hitObj = dCc_GetAc(mSph[i].GetCoHitObj()->GetAc());
fopAc_ac_c* boar_ac;
if (fopAcM_GetName(hitObj) == PROC_E_WB && player->checkBoarRun() != 0 &&
fopAcM_SearchByName(PROC_E_WB, &boar_ac) != 0)
if (fopAcM_GetName(hitObj) == fpcNm_E_WB_e && player->checkBoarRun() != 0 &&
fopAcM_SearchByName(fpcNm_E_WB_e, &boar_ac) != 0)
{
cXyz* boar_speed = &fopAcM_GetSpeed(boar_ac);
daPy_py_c* player = daPy_getPlayerActorClass();
@@ -419,7 +419,7 @@ void daObjCRVGATE_c::OpenAction() {
if (mSph[i].ChkCoHit() != 0) {
local_3c++;
fopAc_ac_c* hitObj = dCc_GetAc(mSph[i].GetCoHitObj()->GetAc());
if (fopAcM_GetName(hitObj) == PROC_E_WB) {
if (fopAcM_GetName(hitObj) == fpcNm_E_WB_e) {
if (mKeyParam == 0xff) {
Z2GetAudioMgr()->seStart(Z2SE_OBJ_CRVN_GATE_BREAK, &current.pos, 0, 0,
1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -483,7 +483,7 @@ void daObjCRVGATE_c::OpenAction() {
if (mSph[i].ChkCoHit() != 0) {
local_3c++;
fopAc_ac_c* hitObj = dCc_GetAc(mSph[i].GetCoHitObj()->GetAc());
if (fopAcM_GetName(hitObj) == PROC_E_WB) {
if (fopAcM_GetName(hitObj) == fpcNm_E_WB_e) {
daPy_py_c* player = daPy_getPlayerActorClass();
mDoorSwingTargetAngle = mDoorAngle - fopAcM_GetSpeedF(player) * 288.0f;
@@ -704,7 +704,7 @@ void daObjCRVGATE_c::SetDoor() {
mKeyParam = 0x01;
// Create the second (identical) part of the door (swinging gate).
mDoorPairProcID = fopAcM_createChild(PROC_Obj_CRVGATE, fopAcM_GetID(this), 1, &child_pos,
mDoorPairProcID = fopAcM_createChild(fpcNm_Obj_CRVGATE_e, fopAcM_GetID(this), 1, &child_pos,
fopAcM_GetRoomNo(this), &child_angle, NULL, -1, 0);
mDoorY = shape_angle.y;
} else {
@@ -834,18 +834,18 @@ static actor_method_class l_daObjCRVGATE_Method = {
};
actor_process_profile_definition g_profile_Obj_CRVGATE = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_CRVGATE, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daObjCRVGATE_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
466, // mPriority
&l_daObjCRVGATE_Method, // sub_method
0x00040180, // 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_CRVGATE_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daObjCRVGATE_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Obj_CRVGATE_e,
/* Actor SubMtd */ &l_daObjCRVGATE_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};