mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-18 12:52:51 -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
+20
-20
@@ -669,7 +669,7 @@ void daNpcTks_c::reset() {
|
||||
setAction(&daNpcTks_c::demo_scannon);
|
||||
cXyz i_pos(current.pos);
|
||||
i_pos.y += 60.0f;
|
||||
parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 3, &i_pos, fopAcM_GetRoomNo(this),
|
||||
parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 3, &i_pos, fopAcM_GetRoomNo(this),
|
||||
&mCurAngle, NULL, -1, NULL);
|
||||
break;
|
||||
}
|
||||
@@ -680,7 +680,7 @@ void daNpcTks_c::reset() {
|
||||
setAction(&daNpcTks_c::demo_Lv6Gate);
|
||||
cXyz i_pos(current.pos);
|
||||
i_pos.y += 60.0f;
|
||||
parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 3, &i_pos, fopAcM_GetRoomNo(this),
|
||||
parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 3, &i_pos, fopAcM_GetRoomNo(this),
|
||||
&mCurAngle, NULL, -1, NULL);
|
||||
break;
|
||||
}
|
||||
@@ -693,7 +693,7 @@ void daNpcTks_c::reset() {
|
||||
cXyz i_pos(current.pos);
|
||||
csXyz i_angle(0, fopAcM_searchPlayerAngleY(this), 0);
|
||||
i_pos.y += 60.0f;
|
||||
parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 4, &i_pos, fopAcM_GetRoomNo(this),
|
||||
parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 4, &i_pos, fopAcM_GetRoomNo(this),
|
||||
&i_angle, NULL, -1, NULL);
|
||||
break;
|
||||
}
|
||||
@@ -731,7 +731,7 @@ void daNpcTks_c::reset() {
|
||||
setAction(&daNpcTks_c::waitLv6);
|
||||
cXyz i_pos(current.pos);
|
||||
i_pos.y += 60.0f;
|
||||
parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 4, &i_pos, fopAcM_GetRoomNo(this),
|
||||
parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 4, &i_pos, fopAcM_GetRoomNo(this),
|
||||
&mCurAngle, NULL, -1, NULL);
|
||||
break;
|
||||
}
|
||||
@@ -2334,7 +2334,7 @@ void daNpcTks_c::demo_Lv7Start() {
|
||||
current.pos.set(120.0f, 3000.0f, 5500.0f);
|
||||
old.pos = current.pos;
|
||||
setAngle(fopAcM_searchPlayerAngleY(this));
|
||||
parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 3, ¤t.pos, fopAcM_GetRoomNo(this),
|
||||
parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 3, ¤t.pos, fopAcM_GetRoomNo(this),
|
||||
&mCurAngle, NULL, -1, NULL);
|
||||
dComIfGp_event_setTalkPartner(this);
|
||||
field_0x138b = false;
|
||||
@@ -2528,7 +2528,7 @@ void daNpcTks_c::demo_Lv7Start() {
|
||||
int iVar1[2] = {0x2520, -1};
|
||||
if (talkProc(iVar1, TRUE, NULL)) {
|
||||
if (!mFlow.checkEndFlow()) {
|
||||
fopAc_ac_c* actor_p = fopAcM_SearchByName(PROC_Tag_Lv7Gate);
|
||||
fopAc_ac_c* actor_p = fopAcM_SearchByName(fpcNm_Tag_Lv7Gate_e);
|
||||
if (actor_p != NULL) {
|
||||
setLookMode(LOOK_ACTOR, actor_p);
|
||||
}
|
||||
@@ -3046,18 +3046,18 @@ static actor_method_class daNpcTks_MethodTable = {
|
||||
};
|
||||
|
||||
actor_process_profile_definition g_profile_NPC_TKS = {
|
||||
fpcLy_CURRENT_e, // mLayerID
|
||||
7, // mListID
|
||||
fpcPi_CURRENT_e, // mListPrio
|
||||
PROC_NPC_TKS, // mProcName
|
||||
&g_fpcLf_Method.base, // sub_method
|
||||
sizeof(daNpcTks_c), // mSize
|
||||
0, // mSizeOther
|
||||
0, // mParameters
|
||||
&g_fopAc_Method.base, // sub_method
|
||||
374, // mPriority
|
||||
&daNpcTks_MethodTable, // sub_method
|
||||
0x08044108, // 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_TKS_e,
|
||||
/* Proc SubMtd */ &g_fpcLf_Method.base,
|
||||
/* Size */ sizeof(daNpcTks_c),
|
||||
/* Size Other */ 0,
|
||||
/* Parameters */ 0,
|
||||
/* Leaf SubMtd */ &g_fopAc_Method.base,
|
||||
/* Draw Prio */ fpcDwPi_NPC_TKS_e,
|
||||
/* Actor SubMtd */ &daNpcTks_MethodTable,
|
||||
/* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_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