diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-05-26 00:11:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-26 00:11:58 -0400 |
| commit | 102042628fa139f4e509251bdd9095493f031e28 (patch) | |
| tree | a5b37fcd76d8c0105f2e9b379b7e2daa7eae2266 /src/d/d_attention.cpp | |
| parent | 79277cb2b2672104b87172d8ff620f923f450658 (diff) | |
Process profiles and enums cleanup (#1031)
* Fix some profile comments
* Add missing static for local visibility data
* Move proc name and draw priority enums to f_pc
* Add _e suffix to daObjBarrier_c proc enum
* Change proc name enum format to match TP
* Change draw prio enum format to match TP
* Change ItemNo enum format, finish fixing item names
* Revert static for cb1 hio
* Clean up formatting of profile comments
* Fix comment alignment
Diffstat (limited to 'src/d/d_attention.cpp')
| -rw-r--r-- | src/d/d_attention.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 32321a21..bd8420dd 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -5,7 +5,6 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_attention.h" -#include "d/d_procname.h" #include "d/actor/d_a_player_main.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_angle.h" @@ -613,7 +612,7 @@ f32 dAttention_c::EnemyDistance(fopAc_ac_c* actor) { if (actor == mpPlayer || mpPlayer == NULL) return -1.0f; - if (fopAcM_GetProfName(actor) == PROC_PLAYER) + if (fopAcM_GetProfName(actor) == fpcNm_PLAYER_e) return -1.0f; if (!(actor->attention_info.flags & fopAc_Attn_LOCKON_BATTLE_e) && !(actor->attention_info.flags & fopAc_Attn_ENEMYFLAG_NOLOCKON_e)) @@ -1105,7 +1104,7 @@ fopAc_ac_c* dAttCatch_c::convPId(fpc_ProcID i_procID) { /* 8009FBBC-8009FBDC .text init__11dAttCatch_cFv */ void dAttCatch_c::init() { - mCatchItemNo = dItem_WATER_BOTTLE_e; + mCatchItemNo = dItemNo_WATER_BOTTLE_e; mRequestActorID = fpcM_ERROR_PROCESS_ID_e; mCatghTargetID = fpcM_ERROR_PROCESS_ID_e; field_0x4 = 3; @@ -1117,7 +1116,7 @@ void dAttCatch_c::proc() { mChangeItem = mCatchItemNo; mRequestActorID = fpcM_ERROR_PROCESS_ID_e; field_0x4 = 3; - mCatchItemNo = dItem_WATER_BOTTLE_e; + mCatchItemNo = dItemNo_WATER_BOTTLE_e; } |