mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 04:48:21 -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_kkri.cpp
+21 -21
View File
@@ -1,6 +1,6 @@
/**
* @file d_a_npc_kkri.cpp
*
*
*/
#include "d/dolzel_rel.h" // IWYU pragma: keep
@@ -300,7 +300,7 @@ daNpc_Kkri_c::~daNpc_Kkri_c() {
if (mpMorf[0] != NULL) {
mpMorf[0]->stopZelAnime();
}
#if DEBUG
if (mpHIO != NULL) {
mpHIO->removeHIO();
@@ -468,7 +468,7 @@ int daNpc_Kkri_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
void* daNpc_Kkri_c::srchYm(void* i_actor, void* i_data) {
if (mFindCount < 50) {
daE_YM_c* ym_p = (daE_YM_c*)i_actor;
if (ym_p != NULL && ym_p != i_data && fopAcM_IsExecuting(fopAcM_GetID(ym_p)) && fopAcM_GetName(ym_p) == PROC_E_YM && !ym_p->isHide()) {
if (ym_p != NULL && ym_p != i_data && fopAcM_IsExecuting(fopAcM_GetID(ym_p)) && fopAcM_GetName(ym_p) == fpcNm_E_YM_e && !ym_p->isHide()) {
mFindActorPtrs[mFindCount] = ym_p;
mFindCount++;
}
@@ -626,7 +626,7 @@ void daNpc_Kkri_c::srchActors() {
switch (mType) {
case 0:
if (mActorMng[0].getActorP() == NULL) {
mActorMng[0].entry(getNearestActorP(PROC_Tag_KtOnFire));
mActorMng[0].entry(getNearestActorP(fpcNm_Tag_KtOnFire_e));
}
/* fallthrough */
case 1:
@@ -677,10 +677,10 @@ void daNpc_Kkri_c::action() {
}
void daNpc_Kkri_c::beforeMove() {
fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e);
if (checkHide()) {
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e);
}
if (checkHide() || mNoDraw) {
@@ -1107,7 +1107,7 @@ int daNpc_Kkri_c::fearWait(void*) {
} else {
mFindCount = 0;
fopAcM_Search(srchYm, this);
int alive_ym_cnt = 0;
for (int i = 0; i < mFindCount; i++) {
if (mFindActorPtrs[i]->health > 0) {
@@ -1246,18 +1246,18 @@ static actor_method_class daNpc_Kkri_MethodTable = {
};
actor_process_profile_definition g_profile_NPC_KKRI = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_NPC_KKRI, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daNpc_Kkri_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
346, // mPriority
&daNpc_Kkri_MethodTable, // sub_method
0x00040107, // mStatus
fopAc_NPC_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_NPC_KKRI_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daNpc_Kkri_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_NPC_KKRI_e,
/* Actor SubMtd */ &daNpc_Kkri_MethodTable,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e,
/* Group */ fopAc_NPC_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};