mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-26 06:16:24 -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.cpp
+5 -5
View File
@@ -1242,7 +1242,7 @@ void daNpcT_c::tgHitCallBack(fopAc_ac_c* i_actor1, dCcD_GObjInf* i_obj1, fopAc_a
fopAc_ac_c* actor1 = i_actor1;
u8 cut_type = 0;
if (i_actor2 != NULL) {
if (fopAcM_GetProfName(i_actor2) == PROC_ALINK) {
if (fopAcM_GetProfName(i_actor2) == fpcNm_ALINK_e) {
cut_type = static_cast<daPy_py_c*>(i_actor2)->getCutType();
} else {
cut_type = daPy_py_c::CUT_TYPE_NM_VERTICAL;
@@ -2235,7 +2235,7 @@ fopAc_ac_c* daNpcT_c::hitChk(dCcD_GObjInf* i_objInf, u32 param_1) {
if (mDamageTimer == 0) {
hit_actor_p = i_objInf->GetTgHitAc();
if (hit_actor_p != NULL) {
if (fopAcM_GetName(hit_actor_p) == PROC_NPC_TK && (param_1 & 1)) {
if (fopAcM_GetName(hit_actor_p) == fpcNm_NPC_TK_e && (param_1 & 1)) {
((daNPC_TK_c*)hit_actor_p)->setBump();
return hit_actor_p;
}
@@ -2403,7 +2403,7 @@ BOOL daNpcT_c::srchPlayerActor() {
cXyz daNpcT_c::getAttnPos(fopAc_ac_c* i_actor) {
cXyz attn_pos = i_actor->attention_info.position;
if (fopAcM_GetName(i_actor) == PROC_ALINK) {
if (fopAcM_GetName(i_actor) == fpcNm_ALINK_e) {
attn_pos.y -= daPy_py_c::getAttentionOffsetY();
if (daPy_py_c::checkNowWolf()) {
attn_pos = i_actor->current.pos;
@@ -2610,7 +2610,7 @@ fopAc_ac_c* daNpcT_c::getEvtAreaTagP(int i_type, int i_no) {
f32 var_f31 = G_CM3D_F_INF;
mFindCount = 0;
mSrchName = PROC_TAG_EVTAREA;
mSrchName = fpcNm_TAG_EVTAREA_e;
fpcM_Search(srchActor, this);
for (int i = 0; i < mFindCount; i++) {
@@ -2625,7 +2625,7 @@ fopAc_ac_c* daNpcT_c::getEvtAreaTagP(int i_type, int i_no) {
fopAc_ac_c* daNpcT_c::getShopItemTagP() {
int unusedInt1 = 0;
mFindCount = 0;
mSrchName = PROC_TAG_SHOPITM;
mSrchName = fpcNm_TAG_SHOPITM_e;
fpcM_Search(srchActor, this);
for (s32 i = 0; i < mFindCount; i++) {