mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 12:52:51 -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_moir.cpp
+26 -26
View File
@@ -1,6 +1,6 @@
/**
* @file d_a_npc_moir.cpp
*
*
*/
#include "d/dolzel_rel.h" // IWYU pragma: keep
@@ -43,7 +43,7 @@ enum MoiR1_RES_File_ID {
};
enum MoiR2_RES_File_ID {
/* BCK */
/* BCK */
/* 0x04 */ BCK_MOIR_DRIVEAWAY = 0x4,
/* 0x05 */ BCK_MOIR_F_DRIVEAWAY,
/* 0x06 */ BCK_MOIR_F_FUE,
@@ -311,7 +311,7 @@ cPhs_Step daNpcMoiR_c::Create() {
return cPhs_ERROR_e;
}
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e);
mMode = MODE_2;
}
@@ -521,15 +521,15 @@ int daNpcMoiR_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
void daNpcMoiR_c::searchActors() {
if (mActorMngr[1].getActorP() == NULL) {
mActorMngr[1].entry(fopAcM_SearchByName(PROC_NPC_ASH));
mActorMngr[1].entry(fopAcM_SearchByName(fpcNm_NPC_ASH_e));
}
if (mActorMngr[2].getActorP() == NULL) {
mActorMngr[2].entry(fopAcM_SearchByName(PROC_NPC_SHAD));
mActorMngr[2].entry(fopAcM_SearchByName(fpcNm_NPC_SHAD_e));
}
if (mActorMngr[3].getActorP() == NULL) {
mActorMngr[3].entry(fopAcM_SearchByName(PROC_NPC_RAFREL));
mActorMngr[3].entry(fopAcM_SearchByName(fpcNm_NPC_RAFREL_e));
}
}
@@ -941,7 +941,7 @@ void daNpcMoiR_c::lookat() {
switch (mLookMode) {
case LOOK_NONE:
break;
case LOOK_RESET:
bVar1 = TRUE;
break;
@@ -982,7 +982,7 @@ void daNpcMoiR_c::lookat() {
mLookat.setAttnPos(0);
}
mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f,
mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f,
head_angleX_min, head_angleX_max, head_angleY_min, head_angleY_max, mCurAngle.y, spd0);
mLookat.calc(this, model->getBaseTRMtx(), local_dc, bVar1, sVar1, FALSE);
}
@@ -1567,7 +1567,7 @@ bool daNpcMoiR_c::leave(void* param_1) {
setMotion(MOT_RUN, -1.0f, 0);
mTurnMode = 0;
speedF = 0.0f;
fopAcM_SearchByName(PROC_NPC_TK, (fopAc_ac_c**)&actor_p);
fopAcM_SearchByName(fpcNm_NPC_TK_e, (fopAc_ac_c**)&actor_p);
if (actor_p != NULL) {
actor_p->setAway();
@@ -1721,7 +1721,7 @@ BOOL daNpcMoiR_c::EvCut_Appear2(int i_cutIndex) {
setExpression(EXPR_NONE, -1.0f);
setMotion(MOT_TAKAJO_NI, -1.0f, 0);
mTurnMode = 0;
ni_class* actor_p = (ni_class*)fopAcM_SearchByName(PROC_NI);
ni_class* actor_p = (ni_class*)fopAcM_SearchByName(fpcNm_NI_e);
if (actor_p != NULL) {
actor_p->changeMode();
@@ -1791,7 +1791,7 @@ BOOL daNpcMoiR_c::EvCut_Appear2(int i_cutIndex) {
case '0005':
if (talkProc(NULL, TRUE, NULL)) {
ni_class* actor_p = (ni_class*)fopAcM_SearchByName(PROC_NI);
ni_class* actor_p = (ni_class*)fopAcM_SearchByName(fpcNm_NI_e);
if (actor_p != NULL) {
actor_p->changeMode();
@@ -1986,7 +1986,7 @@ void daNpcMoiR_c::setAttnPos() {
sp58.y = current.pos.y;
field_0xca0.SetC(sp58);
field_0xca0.SetH(mpHIO->m.common.height);
f32 fVar1;
if (mMode == MODE_SIT) {
fVar1 = 40.0f;
@@ -2020,18 +2020,18 @@ static actor_method_class daNpcMoiR_MethodTable = {
};
actor_process_profile_definition g_profile_NPC_MOIR = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_NPC_MOIR, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daNpcMoiR_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
415, // mPriority
&daNpcMoiR_MethodTable, // sub_method
0x00040100, // 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_MOIR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daNpcMoiR_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_NPC_MOIR_e,
/* Actor SubMtd */ &daNpcMoiR_MethodTable,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_NPC_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};