diff options
| author | Huitzi <73550465+marwernerh@users.noreply.github.com> | 2026-03-09 21:33:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-09 18:33:31 -0700 |
| commit | 0b0fdd1f60193d1e3e610326cc2cf2a7b558d366 (patch) | |
| tree | a39b648ba460b5f80dad748690fa43f6f780e5a6 /src/d/actor/d_a_npc_cd2.cpp | |
| parent | 30e839c28be83fb07bfbe008d3eb9eb9127e3801 (diff) | |
Actor status consolidation & process profile definition editing (#3117)
* 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>
Diffstat (limited to 'src/d/actor/d_a_npc_cd2.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_cd2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp index 503bff2d3f..427e35a7df 100644 --- a/src/d/actor/d_a_npc_cd2.cpp +++ b/src/d/actor/d_a_npc_cd2.cpp @@ -1083,12 +1083,12 @@ int PathTrace_c::decIndex(int param_1) { static void* s_sub(void* param_1, void* param_2) { if (fopAcM_IsActor(param_1) && - ((fopAcM_GetName(param_1) == PROC_ALINK && !dKy_darkworld_check()) || - fopAcM_GetName(param_1) == PROC_NPC_CD3 || fopAcM_GetName(param_1) == PROC_NPC_PASSER || - fopAcM_GetName(param_1) == PROC_NPC_GUARD || fopAcM_GetName(param_1) == PROC_NPC_FGUARD || - fopAcM_GetName(param_1) == PROC_NPC_SHOE || fopAcM_GetName(param_1) == PROC_NPC_KASIHANA || - fopAcM_GetName(param_1) == PROC_NPC_KASIKYU || - fopAcM_GetName(param_1) == PROC_NPC_KASIMICH)) + ((fopAcM_GetName(param_1) == fpcNm_ALINK_e && !dKy_darkworld_check()) || + fopAcM_GetName(param_1) == fpcNm_NPC_CD3_e || fopAcM_GetName(param_1) == fpcNm_NPC_PASSER_e || + fopAcM_GetName(param_1) == fpcNm_NPC_GUARD_e || fopAcM_GetName(param_1) == fpcNm_NPC_FGUARD_e || + fopAcM_GetName(param_1) == fpcNm_NPC_SHOE_e || fopAcM_GetName(param_1) == fpcNm_NPC_KASIHANA_e || + fopAcM_GetName(param_1) == fpcNm_NPC_KASIKYU_e || + fopAcM_GetName(param_1) == fpcNm_NPC_KASIMICH_e)) { static_cast<PathTrace_c*>(param_2)->checkObstacleSub((fopAc_ac_c*)param_1); } |