mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-05 17:10:48 -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_scannon.cpp
+19 -19
View File
@@ -1,6 +1,6 @@
/**
* @file d_a_obj_scannon.cpp
*
*
*/
#include "d/dolzel_rel.h" // IWYU pragma: keep
@@ -393,7 +393,7 @@ void daSCannon_c::exeModeWait() {
mMode = MODE_ORDER_EVT;
if (!fopAcM_isSwitch(this, getSw2())) {
cXyz pos(TKS_SET_POS);
fopAcM_create(PROC_NPC_TKS, 1, &pos, fopAcM_GetRoomNo(this), NULL, NULL, -1);
fopAcM_create(fpcNm_NPC_TKS_e, 1, &pos, fopAcM_GetRoomNo(this), NULL, NULL, -1);
}
}
break;
@@ -626,7 +626,7 @@ void daSCannon_c::demoInitFinish() {
#endif
fopAcM_seStartCurrent(this, Z2SE_OBJ_BOMB_EXPLODE, 0);
fopAcM_OffStatus(this, 0x80);
fopAcM_OffStatus(this, fopAcStts_NOEXEC_e);
dComIfGp_getVibration().StopQuake(0x1F);
dComIfGp_getVibration().StartShock(8, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
@@ -665,7 +665,7 @@ void daSCannon_c::demoInitWarpEndWait() {
}
mpPtlBtk->setPlaySpeed(1.0f);
daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0);
if (player_p != NULL) {
cXyz pos(-101987.7f, -18470.0f, 55863.813f);
@@ -709,7 +709,7 @@ void daSCannon_c::changeScene() {
dComIfGp_getVibration().StopQuake(0x1F);
}
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x80);
fopAcM_OnStatus(this, fopAcStts_NOEXEC_e);
if (field_0x619 == 0) {
field_0x619 = 1;
@@ -851,18 +851,18 @@ static actor_method_class daSCannon_METHODS = {
};
actor_process_profile_definition g_profile_Obj_SCannon = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_SCannon, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daSCannon_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
734, // mPriority
&daSCannon_METHODS, // sub_method
0x00044180, // mStatus
fopAc_ENV_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Obj_SCannon_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daSCannon_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Obj_SCannon_e,
/* Actor SubMtd */ &daSCannon_METHODS,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e,
/* Group */ fopAc_ENV_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};