mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-30 23:44:28 -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_obj_kag.cpp
+20 -20
View File
@@ -1,6 +1,6 @@
/**
* @file d_a_obj_kag.cpp
*
*
*/
#include "d/dolzel_rel.h" // IWYU pragma: keep
@@ -223,7 +223,7 @@ void daObjKAG_c::fly() {
if (field_0x85a == 0) {
if (flamePos != NULL && current.pos.absXZ(*flamePos) < 1800.0f) {
field_0x84e = cLib_targetAngleY(&current.pos, flamePos) + cM_rndFX(8192.0f);
if (current.pos.absXZ(*flamePos) < 200.0f) {
field_0x85a = cM_rndF(4.0f) + 4.0f;
} else {
@@ -381,7 +381,7 @@ void daObjKAG_c::walk() {
void daObjKAG_c::bin_wait() {
if (field_0x83c == 0) {
mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("I_Kag", BCK_KAG_FLY), J3DFrameCtrl::EMode_LOOP, 5.0f, 0.0f, 0.0f, -1.0f);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e);
mDraw = false;
gravity = 0.0f;
maxFallSpeed = 0.0f;
@@ -448,7 +448,7 @@ void daObjKAG_c::hook() {
kag_setParticle();
}
if (!fopAcM_CheckStatus(this, fopAcM_STATUS_HOOK_CARRY_NOW)) {
if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) {
setAction(&daObjKAG_c::fly);
}
@@ -459,7 +459,7 @@ void daObjKAG_c::hook() {
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
cM3dGPla plane;
cXyz spbc;
dComIfG_Bgsp().GetTriPla(lin_chk, &plane);
cXyz* pcVar1 = plane.GetNP();
spbc = lin_chk.GetCross();
@@ -648,7 +648,7 @@ cPhs_Step daObjKAG_c::create() {
cPhs_Step phase = dComIfG_resLoad(&mPhase, "I_Kag");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("KAG PARAM %x\n", fopAcM_GetParam(this));
field_0x85e = fopAcM_GetParam(this) & 3;
if (field_0x85e == 3) {
field_0x85e = 0;
@@ -769,18 +769,18 @@ static actor_method_class l_daObjKAG_Method = {
};
actor_process_profile_definition g_profile_Obj_Kag = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_Kag, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daObjKAG_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
485, // mPriority
&l_daObjKAG_Method, // sub_method
0x000C0100, // mStatus
fopAc_ENV_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Obj_Kag_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daObjKAG_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Obj_Kag_e,
/* Actor SubMtd */ &l_daObjKAG_Method,
/* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENV_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};