mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-31 07:45:48 -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_bosswarp.cpp
+19 -19
View File
@@ -9,7 +9,7 @@
#include "SSystem/SComponent/c_math.h"
#include "d/actor/d_a_midna.h"
#include "d/actor/d_a_player.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
#include "d/actor/d_a_obj_life_container.h"
#include "d/actor/d_a_obj_ystone.h"
#include <cstring>
@@ -243,7 +243,7 @@ int daObjBossWarp_c::execute() {
if (field_0x595 && midna != NULL) {
midna->onTagWaitPos(&field_0x620);
}
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE);
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e);
int level = getNowLevel();
if (ystone != NULL && midna != NULL) {
@@ -314,7 +314,7 @@ void daObjBossWarp_c::actionWait() {
void daObjBossWarp_c::actionOrderEvent() {
if (eventInfo.checkCommandDemoAccrpt()) {
dComIfGp_event_setTalkPartner(fopAcM_SearchByName(PROC_OBJ_YSTONE));
dComIfGp_event_setTalkPartner(fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e));
setAction(ACT_EVENT);
mStaffId = dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0);
demoProc();
@@ -446,10 +446,10 @@ int daObjBossWarp_c::demoProc() {
};
daPy_py_c* player = daPy_getPlayerActorClass();
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE);
obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e);
cXyz unused(100000.0f, 0.0f, 0.0f);
daMidna_c* midna = (daMidna_c*)daPy_py_c::getMidnaActor();
daObjLife_c* life_container = (daObjLife_c*)fopAcM_SearchByName(PROC_Obj_LifeContainer);
daObjLife_c* life_container = (daObjLife_c*)fopAcM_SearchByName(fpcNm_Obj_LifeContainer_e);
cXyz life_pos(900.0f, 0.0f, 0.0f);
int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 15, 0, 0);
@@ -671,18 +671,18 @@ static actor_method_class l_daObjBossWarp_Method = {
};
actor_process_profile_definition g_profile_Obj_BossWarp = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_Obj_BossWarp,
&g_fpcLf_Method.base,
sizeof(daObjBossWarp_c),
0,
0,
&g_fopAc_Method.base,
0x2DA,
&l_daObjBossWarp_Method,
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Obj_BossWarp_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daObjBossWarp_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Obj_BossWarp_e,
/* Actor SubMtd */ &l_daObjBossWarp_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};