mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 20:43:07 -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_lv1Candle00.cpp
+16 -16
View File
@@ -6,7 +6,7 @@
#include "d/actor/d_a_obj_lv1Candle00.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
static daLv1Cdl00_HIO_c l_HIO;
@@ -210,7 +210,7 @@ int daLv1Cdl00_c::Execute() {
cCcD_Obj* obj = mCyl.GetTgHitObj();
if (obj != NULL) {
bool bvar1 = true;
if (fopAcM_GetName(obj->GetAc()) == PROC_ALINK) {
if (fopAcM_GetName(obj->GetAc()) == fpcNm_ALINK_e) {
if (mCyl.GetTgHitGObj()->ChkAtType(AT_TYPE_NORMAL_SWORD) && mTgHit) {
bvar1 = false;
}
@@ -276,18 +276,18 @@ static actor_method_class l_daLv1Cdl00_Method = {
};
actor_process_profile_definition g_profile_Obj_Lv1Cdl00 = {
fpcLy_CURRENT_e,
3,
fpcPi_CURRENT_e,
PROC_Obj_Lv1Cdl00,
&g_fpcLf_Method.base,
sizeof(daLv1Cdl00_c),
0,
0,
&g_fopAc_Method.base,
0x1EE,
&l_daLv1Cdl00_Method,
0x60000,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Obj_Lv1Cdl00_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daLv1Cdl00_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Obj_Lv1Cdl00_e,
/* Actor SubMtd */ &l_daLv1Cdl00_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};