mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-01 15:59:45 -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_ash.cpp
+20 -20
View File
@@ -69,16 +69,16 @@ void daNpcAsh_c::setLookMode(int i_lookMode, fopAc_ac_c* i_talkPartner) {
void daNpcAsh_c::searchActors() {
if (!mActorMngr[1].getActorP()) {
mActorMngr[1].entry(fopAcM_SearchByName(PROC_NPC_SHAD));
mActorMngr[1].entry(fopAcM_SearchByName(fpcNm_NPC_SHAD_e));
}
if (!mActorMngr[2].getActorP()) {
mActorMngr[2].entry(fopAcM_SearchByName(PROC_NPC_RAFREL));
mActorMngr[2].entry(fopAcM_SearchByName(fpcNm_NPC_RAFREL_e));
}
if (!mActorMngr[3].getActorP()) {
mActorMngr[3].entry(fopAcM_SearchByName(PROC_NPC_MOIR));
mActorMngr[3].entry(fopAcM_SearchByName(fpcNm_NPC_MOIR_e));
}
if (isMap() && !mActorMngr[4].getActorP()) {
mActorMngr[4].entry(fopAcM_SearchByName(PROC_Obj_Table));
mActorMngr[4].entry(fopAcM_SearchByName(fpcNm_Obj_Table_e));
}
if (!mActorMngr[5].getActorP()) {
mActorMngr[5].entry(getEvtAreaTagP(17, 0));
@@ -240,7 +240,7 @@ cPhs_Step daNpcAsh_c::Create() {
if (dComIfGs_isSaveSwitch(0x14)) {
return cPhs_ERROR_e;
}
fopAcM_OnStatus(this, 0x4000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e);
mType = TYPE_CASTLE;
}
@@ -592,7 +592,7 @@ void daNpcAsh_c::reset() {
}
if (isSneaking()) {
fopAcM_OnStatus(this, 0x4000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e);
}
if (mType == TYPE_BAR) {
@@ -1336,18 +1336,18 @@ static actor_method_class daNpcAsh_MethodTable = {
};
actor_process_profile_definition g_profile_NPC_ASH = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_NPC_ASH,
&g_fpcLf_Method.base,
sizeof(daNpcAsh_c),
0,
0,
&g_fopAc_Method.base,
411,
&daNpcAsh_MethodTable,
0x40100,
fopAc_NPC_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_NPC_ASH_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daNpcAsh_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_NPC_ASH_e,
/* Actor SubMtd */ &daNpcAsh_MethodTable,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_NPC_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};