mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-18 04:48:21 -04:00
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>
This commit is contained in:
Huitzi
@@ -1,6 +1,6 @@
|
||||
/**
|
||||
* @file d_a_npc_shaman.cpp
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
@@ -18,7 +18,7 @@ void daNpc_Sha_HIO_c::listenPropertyEvent(const JORPropertyEvent* event) {
|
||||
char buffer[2000];
|
||||
|
||||
JORReflexible::listenPropertyEvent(event);
|
||||
|
||||
|
||||
JORFile jorFile;
|
||||
int len;
|
||||
|
||||
@@ -255,7 +255,7 @@ cPhs_Step daNpc_Sha_c::create() {
|
||||
}
|
||||
|
||||
OS_REPORT("\n");
|
||||
|
||||
|
||||
static int const heapSize[3] = {
|
||||
0x3AF0, 0x3AF0, 0x3AF0,
|
||||
};
|
||||
@@ -274,7 +274,7 @@ cPhs_Step daNpc_Sha_c::create() {
|
||||
#endif
|
||||
|
||||
reset();
|
||||
|
||||
|
||||
mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this),
|
||||
fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this));
|
||||
mCcStts.Init(mpHIO->m.common.weight, 0, this);
|
||||
@@ -369,7 +369,7 @@ u8 daNpc_Sha_c::getType() {
|
||||
switch (param) {
|
||||
case 0:
|
||||
return 0;
|
||||
|
||||
|
||||
case 1:
|
||||
return 1;
|
||||
|
||||
@@ -476,7 +476,7 @@ BOOL daNpc_Sha_c::checkChangeEvt() {
|
||||
switch (mType) {
|
||||
case 0:
|
||||
break;
|
||||
|
||||
|
||||
case 1:
|
||||
if (field_0xfa0 == 0) {
|
||||
mEvtNo = 2;
|
||||
@@ -504,7 +504,7 @@ void daNpc_Sha_c::setAfterTalkMotion() {
|
||||
case 2:
|
||||
idx = 8;
|
||||
break;
|
||||
|
||||
|
||||
case 3:
|
||||
idx = 5;
|
||||
break;
|
||||
@@ -593,10 +593,10 @@ void daNpc_Sha_c::action() {
|
||||
}
|
||||
|
||||
void daNpc_Sha_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) {
|
||||
@@ -610,7 +610,7 @@ void daNpc_Sha_c::setAttnPos() {
|
||||
|
||||
mStagger.calc(FALSE);
|
||||
f32 rad = cM_s2rad((s16)(mCurAngle.y - field_0xd7e.y));
|
||||
|
||||
|
||||
mJntAnm.setParam(this, mpMorf[0]->getModel(), &pos, getBackboneJointNo(), getNeckJointNo(), getHeadJointNo(),
|
||||
mpHIO->m.common.body_angleX_min, mpHIO->m.common.body_angleX_max, mpHIO->m.common.body_angleY_min, mpHIO->m.common.body_angleY_max,
|
||||
mpHIO->m.common.head_angleX_min, mpHIO->m.common.head_angleX_max, mpHIO->m.common.head_angleY_min, mpHIO->m.common.head_angleY_max,
|
||||
@@ -897,7 +897,7 @@ int daNpc_Sha_c::cutPerformAugury(int i_staffId) {
|
||||
dComIfGp_event_offHindFlag(128);
|
||||
initTalk(0x772, NULL);
|
||||
break;
|
||||
|
||||
|
||||
case 5:
|
||||
dComIfGp_event_offHindFlag(128);
|
||||
initTalk(0x773, NULL);
|
||||
@@ -955,7 +955,7 @@ int daNpc_Sha_c::cutPerformAugury(int i_staffId) {
|
||||
setTempBit(mSceneChangeNoTableIx);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (mSceneChangeNoTableIx == -2) {
|
||||
mEvtNo = 3;
|
||||
evtChange();
|
||||
@@ -979,7 +979,7 @@ int daNpc_Sha_c::cutPerformAugury(int i_staffId) {
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case 2:
|
||||
case 6:
|
||||
case 7:
|
||||
@@ -1251,18 +1251,18 @@ static actor_method_class daNpc_Sha_MethodTable = {
|
||||
};
|
||||
|
||||
actor_process_profile_definition g_profile_NPC_SHAMAN = {
|
||||
fpcLy_CURRENT_e, // mLayerID
|
||||
7, // mListID
|
||||
fpcPi_CURRENT_e, // mListPrio
|
||||
PROC_NPC_SHAMAN, // mProcName
|
||||
&g_fpcLf_Method.base, // sub_method
|
||||
sizeof(daNpc_Sha_c), // mSize
|
||||
0, // mSizeOther
|
||||
0, // mParameters
|
||||
&g_fopAc_Method.base, // sub_method
|
||||
364, // mPriority
|
||||
&daNpc_Sha_MethodTable, // sub_method
|
||||
0x00040108, // 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_SHAMAN_e,
|
||||
/* Proc SubMtd */ &g_fpcLf_Method.base,
|
||||
/* Size */ sizeof(daNpc_Sha_c),
|
||||
/* Size Other */ 0,
|
||||
/* Parameters */ 0,
|
||||
/* Leaf SubMtd */ &g_fopAc_Method.base,
|
||||
/* Draw Prio */ fpcDwPi_NPC_SHAMAN_e,
|
||||
/* Actor SubMtd */ &daNpc_Sha_MethodTable,
|
||||
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e,
|
||||
/* Group */ fopAc_NPC_e,
|
||||
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user