mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 23:27:25 -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_sq.cpp
+16 -16
View File
@@ -11,7 +11,7 @@
#include "d/actor/d_a_player.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
static bool hio_set;
@@ -498,7 +498,7 @@ static cPhs_Step daSq_Create(fopAc_ac_c* i_this) {
if (step == cPhs_COMPLEATE_e) {
_this->mParam0 = fopAcM_GetParam(_this) & 0xff;
if (_this->mParam0 == 1) {
fopAcM_create(PROC_NPC_SQ, fopAcM_GetParam(_this), &_this->home.pos,
fopAcM_create(fpcNm_NPC_SQ_e, fopAcM_GetParam(_this), &_this->home.pos,
fopAcM_GetRoomNo(_this), &_this->home.angle, NULL, 0xff);
return cPhs_ERROR_e;
}
@@ -586,18 +586,18 @@ static actor_method_class l_daSq_Method = {
};
actor_process_profile_definition g_profile_SQ = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_SQ,
&g_fpcLf_Method.base,
sizeof(sq_class),
0,
0,
&g_fopAc_Method.base,
0x2B9,
&l_daSq_Method,
0xC0000,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_SQ_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(sq_class),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_SQ_e,
/* Actor SubMtd */ &l_daSq_Method,
/* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};