mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 13:13:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Process profiles and enums cleanup (#1031)

Browse Source 
* Fix some profile comments

* Add missing static for local visibility data

* Move proc name and draw priority enums to f_pc

* Add _e suffix to daObjBarrier_c proc enum

* Change proc name enum format to match TP

* Change draw prio enum format to match TP

* Change ItemNo enum format, finish fixing item names

* Revert static for cb1 hio

* Clean up formatting of profile comments

* Fix comment alignment
This commit is contained in:
LagoLunatic
2026-05-26 00:11:58 -04:00
committed by GitHub
parent 79277cb2b2
commit 102042628f
540 changed files with 9562 additions and 10530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_bst.cpp
+11 -13
View File
@@ -19,8 +19,6 @@
#include "f_op/f_op_msg_mng.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_graphic.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "JSystem/JUtility/JUTReport.h"
@@ -1087,7 +1085,7 @@ static BOOL bom_eat_check(bst_class* i_this) {
if (hit_obj != NULL) {
fopAc_ac_c* hit_actor = (fopAc_ac_c*)hit_obj->GetAc();
daBomb_c* bomb = (daBomb_c*)hit_actor;
if (hit_actor != NULL && fopAcM_GetName(hit_actor) == PROC_BOMB && bomb->getBombCheck_Flag() == 0 && bomb->getBombRestTime() > 1) {
if (hit_actor != NULL && fopAcM_GetName(hit_actor) == fpcNm_BOMB_e && bomb->getBombCheck_Flag() == 0 && bomb->getBombRestTime() > 1) {
i_this->mBombId = fopAcM_GetID(bomb);
bomb->setBombCheck_Flag();
bomb->change_state(daBomb_c::STATE_2);
@@ -1576,12 +1574,12 @@ static void hana_demo(bst_class* i_this) {
if ((s32)i_this->m02B8->getFrame() == 26) {
int itemNo;
if (dComIfGs_getArrowNum() == 0) {
itemNo = dItem_ARROW_10_e;
itemNo = dItemNo_ARROW_10_e;
MtxP mtx = i_this->m02B8->getModel()->getAnmMtx(6);
cMtx_copy(mtx, *calc_mtx);
i_this->m2E9E = 0;
} else {
itemNo = dItem_BOMB_5_e;
itemNo = dItemNo_BOMB_5_e;
MtxP mtx = i_this->m02B8->getModel()->getAnmMtx(7);
cMtx_copy(mtx, *calc_mtx);
i_this->m2E9E = 1;
@@ -3166,7 +3164,7 @@ static cPhs_State daBst_Create(fopAc_ac_c* a_this) {
i_this->mEyeHealth[1] = 2;
i_this->mEyeHealth[0] = 2;
for (s32 i = 0; i < (s32)ARRAY_SIZE(i_this->m2E90); i++) {
i_this->m2E90[i] = fopAcM_create(PROC_ATT, 100, &actor->current.pos, fopAcM_GetRoomNo(actor));
i_this->m2E90[i] = fopAcM_create(fpcNm_ATT_e, 100, &actor->current.pos, fopAcM_GetRoomNo(actor));
}
for (s32 i = 0; i < (s32)ARRAY_SIZE(i_this->mCcD_beams); i++) {
i_this->mCcD_beams[i].Set(beam_sph_src);
@@ -3198,18 +3196,18 @@ static actor_method_class l_daBst_Method = {
};
actor_process_profile_definition g_profile_BST = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BST,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BST_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bst_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BST,
/* Draw Prio */ fpcDwPi_BST_e,
/* Actor SubMtd */ &l_daBst_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};