diff options
| author | Huitzi <73550465+marwernerh@users.noreply.github.com> | 2026-03-09 21:33:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-09 18:33:31 -0700 |
| commit | 0b0fdd1f60193d1e3e610326cc2cf2a7b558d366 (patch) | |
| tree | a39b648ba460b5f80dad748690fa43f6f780e5a6 /src/d/d_s_room.cpp | |
| parent | 30e839c28be83fb07bfbe008d3eb9eb9127e3801 (diff) | |
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>
Diffstat (limited to 'src/d/d_s_room.cpp')
| -rw-r--r-- | src/d/d_s_room.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 3b171087ae..dcedfe3dc3 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -120,7 +120,7 @@ static bool setArchiveBank(int i_roomNo) { } static int objectDeleteJugge(void* i_process, void* i_data) { - if (fpcM_GetProfName(i_process) != PROC_BG) { + if (fpcM_GetProfName(i_process) != fpcNm_BG_e) { if (fopAcM_IsActor(i_process)) { #if DEBUG char namebuf[16]; @@ -230,7 +230,7 @@ static bool objectSetCheck(room_of_scene_class* i_this) { } } - fopAcM_create(PROC_BG, roomNo, NULL, -1, NULL, NULL, -1); + fopAcM_create(fpcNm_BG_e, roomNo, NULL, -1, NULL, NULL, -1); dComIfGp_getPEvtManager()->demoInit(); dComIfGp_getPEvtManager()->roomInit(roomNo); dStage_dt_c_roomReLoader(i_this->roomInfo, i_this->roomDt, roomNo); @@ -509,14 +509,14 @@ static scene_method_class l_dScnRoom_Method = { }; scene_process_profile_definition g_profile_ROOM_SCENE = { - fpcLy_CURRENT_e, // mLayerID - 0, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_ROOM_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - sizeof(room_of_scene_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - &l_dScnRoom_Method, // mpMtd + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ROOM_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(room_of_scene_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnRoom_Method, }; |