mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-19 13:03:33 -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_b_mgn.cpp
+20 -20
View File
@@ -351,7 +351,7 @@ static int daB_MGN_Draw(daB_MGN_c* i_this) {
static void* s_obj_sub(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor)) {
if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_ARROW) {
if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e) {
if (fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data) < 1500.0f + nREG_F(9)) {
if (fopAcM_GetSpeedF((fopAc_ac_c*)i_actor)) {
s16 var_r29 = ((fopAc_ac_c*)i_actor)->current.angle.y;
@@ -919,7 +919,7 @@ void daB_MGN_c::offBodySlideAt() {
bool daB_MGN_c::checkHitSlideAt() {
for (int i = 0; i < 15; i++) {
if (mBodyCcSph[i].ChkAtHit() && !mBodyCcSph[i].ChkAtShieldHit()) {
if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[i].GetAtHitObj()->GetAc())) == PROC_ALINK) {
if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[i].GetAtHitObj()->GetAc())) == fpcNm_ALINK_e) {
return true;
}
}
@@ -1526,7 +1526,7 @@ void daB_MGN_c::executeDash() {
if (dComIfG_Bgsp().LineCross(&spE8)) {
var_r27 = dComIfG_Bgsp().GetActorPointer(spE8);
if (!var_r27 || fopAcM_GetName(var_r27) != PROC_Obj_BHASHI) {
if (!var_r27 || fopAcM_GetName(var_r27) != fpcNm_Obj_BHASHI_e) {
attention_info.flags = 0;
field_0x20f4[0].OffTgSetBit();
mAtSph.OffAtSetBit();
@@ -1537,7 +1537,7 @@ void daB_MGN_c::executeDash() {
} else {
if (mAcch.ChkWallHit()) {
var_r27 = dComIfG_Bgsp().GetActorPointer(mAcchCir);
if (!var_r27 || fopAcM_GetName(var_r27) != PROC_Obj_BHASHI) {
if (!var_r27 || fopAcM_GetName(var_r27) != fpcNm_Obj_BHASHI_e) {
if (abs((s16)(mAcchCir.GetWallAngleY() - shape_angle.y)) > 0x6000) {
field_0x20f4[0].OffTgSetBit();
mAtSph.OffAtSetBit();
@@ -2548,7 +2548,7 @@ void daB_MGN_c::executeOpening() {
return;
}
fopAcM_OffStatus(this, 0x4000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e);
player->changeOriginalDemo();
player->setPlayerPosAndAngle(&pos, 0, 0);
@@ -3169,7 +3169,7 @@ void daB_MGN_c::action() {
if (mBodyCcSph[0].ChkAtSPrm(1) && mAcch.ChkWallHit()) {
daObjBHASHI_c* pillar = (daObjBHASHI_c*)dComIfG_Bgsp().GetActorPointer(mAcchCir);
if (pillar != NULL && fopAcM_GetName(pillar) == PROC_Obj_BHASHI) {
if (pillar != NULL && fopAcM_GetName(pillar) == fpcNm_Obj_BHASHI_e) {
pillar->Obj_Damage(current.pos);
}
}
@@ -3582,18 +3582,18 @@ static actor_method_class l_daB_MGN_Method = {
};
actor_process_profile_definition g_profile_B_MGN = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_MGN, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daB_MGN_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
232, // mPriority
&l_daB_MGN_Method, // sub_method
0x00044000, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_B_MGN_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daB_MGN_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_B_MGN_e,
/* Actor SubMtd */ &l_daB_MGN_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};