mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-30 07:34:37 -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_e_ot.cpp
+20 -20
View File
@@ -161,7 +161,7 @@ void daE_OT_c::damage_check() {
if (mCcSph.ChkCoHit()) {
fopAc_ac_c* hit_actor = dCc_GetAc(mCcSph.GetCoHitObj()->GetAc());
if (fopAcM_GetName(dCc_GetAc(hit_actor)) == PROC_E_DT
if (fopAcM_GetName(dCc_GetAc(hit_actor)) == fpcNm_E_DT_e
&& static_cast<daE_DT_c*>(hit_actor)->isFlyingAttack())
{
setActionMode(ACT_DAMAGE, 10);
@@ -530,7 +530,7 @@ void daE_OT_c::executeDamage() {
}
fopAcM_delete(this);
if (cM_rnd() < l_HIO.mHeartDropRate) {
fopAcM_createItem(&current.pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0);
fopAcM_createItem(&current.pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0);
}
}
break;
@@ -567,14 +567,14 @@ void daE_OT_c::executeDamage() {
}
fopAcM_delete(this);
if (cM_rnd() < l_HIO.mHeartDropRate) {
fopAcM_createItem(&current.pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0);
fopAcM_createItem(&current.pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0);
}
break;
}
}
void daE_OT_c::action() {
fopAcM_SearchByName(PROC_E_DT, (fopAc_ac_c**)&mpToadActor);
fopAcM_SearchByName(fpcNm_E_DT_e, (fopAc_ac_c**)&mpToadActor);
if (mpToadActor == NULL || fpcM_IsCreating(fopAcM_GetID(mpToadActor))
|| mpToadActor->isDead() == 2)
@@ -777,7 +777,7 @@ cPhs_Step daE_OT_c::create() {
mAtInfo.mpSound = &mSound;
mAtInfo.mPowerType = 1;
gravity = 0.0f;
fopAcM_SearchByName(PROC_E_DT, (fopAc_ac_c**)&mpToadActor);
fopAcM_SearchByName(fpcNm_E_DT_e, (fopAc_ac_c**)&mpToadActor);
mChildNo = fopAcM_GetParam(this) & 0xffff;
mDemoMode = (fopAcM_GetParam(this) >> 0x10) & 0xff;
@@ -787,7 +787,7 @@ cPhs_Step daE_OT_c::create() {
switch (mDemoMode) {
case 3:
fopAcM_OnStatus(this, 0x8000);
fopAcM_OnStatus(this, fopAcStts_STAFF_PRIMARY_e);
// fallthrough
case 0:
@@ -838,20 +838,20 @@ static actor_method_class l_daE_OT_Method = {
};
actor_process_profile_definition g_profile_E_OT = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_OT, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daE_OT_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
203, // mPriority
&l_daE_OT_Method, // sub_method
0x00050100, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_E_OT_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daE_OT_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_E_OT_e,
/* Actor SubMtd */ &l_daE_OT_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES