mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 20:57:46 -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_npc_hanjo.cpp
+18 -18
View File
@@ -610,7 +610,7 @@ void daNpc_Hanjo_c::action() {
fopAc_ac_c* hitActor = hitChk(&mCyl1, 0xffffffff);
if (hitActor != NULL) {
cCcD_Obj* hitObj = mCyl1.GetTgHitObj();
if (hitObj->ChkAtType(AT_TYPE_THROW_OBJ) && (fopAcM_GetName(hitActor) != PROC_NPC_TK || mType != TYPE_1))
if (hitObj->ChkAtType(AT_TYPE_THROW_OBJ) && (fopAcM_GetName(hitActor) != fpcNm_NPC_TK_e || mType != TYPE_1))
{
mStagger.setParam(this,
hitActor, mCurAngle.y);
@@ -638,9 +638,9 @@ void daNpc_Hanjo_c::action() {
void daNpc_Hanjo_c::beforeMove() {
cXyz oldPos;
cXyz pos;
fopAcM_OffStatus(this, 0x8000000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e);
if (checkHide()) {
fopAcM_OnStatus(this, 0x8000000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e);
}
if (checkHide() || mNoDraw != 0) {
attention_info.flags = 0;
@@ -1248,7 +1248,7 @@ int daNpc_Hanjo_c::cutPursuitBee(int param_1) {
if (mStones[i].getSphP()->ChkCoHit()) {
fopAc_ac_c* hitActor = mStones[i].getSphP()->GetCoHitObj()->GetAc();
fopAc_ac_c* hitActor2 = dCc_GetAc(hitActor);
if (hitActor2 != NULL && fopAcM_GetName(hitActor2) == PROC_E_NEST) {
if (hitActor2 != NULL && fopAcM_GetName(hitActor2) == fpcNm_E_NEST_e) {
mEventTimer = mpHIO->m.field_0xb0;
}
mStones[i].initialize();
@@ -1960,18 +1960,18 @@ static actor_method_class daNpc_Hanjo_MethodTable = {
};
actor_process_profile_definition g_profile_NPC_HANJO = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_NPC_HANJO, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daNpc_Hanjo_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
341, // mPriority
&daNpc_Hanjo_MethodTable, // sub_method
0x00040107, // mStatus
fopAc_NPC_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_NPC_HANJO_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daNpc_Hanjo_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_NPC_HANJO_e,
/* Actor SubMtd */ &daNpc_Hanjo_MethodTable,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e,
/* Group */ fopAc_NPC_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};