mirror of
https://github.com/zeldaret/tww.git
synced 2026-09-07 11:01:40 -04:00
Process profiles and enums cleanup (#1031)
* 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:
@@ -11,8 +11,6 @@
|
||||
#include "d/d_bg_s_func.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "d/d_lib.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "d/d_priority.h"
|
||||
#include "d/res/res_daiocta.h"
|
||||
|
||||
const s32 daDaiocta_Eye_c::m_heapsize = 2848;
|
||||
@@ -184,7 +182,7 @@ void coHit_CB(fopAc_ac_c* i_this, dCcD_GObjInf*, fopAc_ac_c* i_actor, dCcD_GObjI
|
||||
|
||||
/* 00000510-000005D0 .text _coHit__15daDaiocta_Eye_cFP10fopAc_ac_c */
|
||||
void daDaiocta_Eye_c::_coHit(fopAc_ac_c* i_actor) {
|
||||
if (fpcM_GetName(i_actor) == PROC_BOMB) {
|
||||
if (fpcM_GetName(i_actor) == fpcNm_BOMB_e) {
|
||||
daBomb_c* bomb_p = (daBomb_c *) i_actor;
|
||||
if (bomb_p->chk_state(daBomb_c::STATE_4)) {
|
||||
if (!mbIsDead) {
|
||||
@@ -461,7 +459,7 @@ void daDaiocta_Eye_c::createInit() {
|
||||
mEyeScale.setall(1.0f);
|
||||
if (parentActorID != fpcM_ERROR_PROCESS_ID_e) {
|
||||
fopAc_ac_c* parent_p = fopAcM_SearchByID(parentActorID);
|
||||
if (parent_p && fopAc_IsActor(parent_p) && fpcM_GetName(parent_p) == PROC_DAIOCTA) {
|
||||
if (parent_p && fopAc_IsActor(parent_p) && fpcM_GetName(parent_p) == fpcNm_DAIOCTA_e) {
|
||||
mpParentActor = (daDaiocta_c *) parent_p;
|
||||
}
|
||||
}
|
||||
@@ -521,18 +519,18 @@ static actor_method_class daDaiocta_EyeMethodTable = {
|
||||
};
|
||||
|
||||
actor_process_profile_definition g_profile_DAIOCTA_EYE = {
|
||||
/* LayerID */ fpcLy_CURRENT_e,
|
||||
/* ListID */ 0x0007,
|
||||
/* ListPrio */ fpcPi_CURRENT_e,
|
||||
/* ProcName */ PROC_DAIOCTA_EYE,
|
||||
/* Layer ID */ fpcLy_CURRENT_e,
|
||||
/* List ID */ 0x0007,
|
||||
/* List Prio */ fpcPi_CURRENT_e,
|
||||
/* Proc Name */ fpcNm_DAIOCTA_EYE_e,
|
||||
/* Proc SubMtd */ &g_fpcLf_Method.base,
|
||||
/* Size */ sizeof(daDaiocta_Eye_c),
|
||||
/* SizeOther */ 0,
|
||||
/* Size Other */ 0,
|
||||
/* Parameters */ 0,
|
||||
/* Leaf SubMtd */ &g_fopAc_Method.base,
|
||||
/* Priority */ PRIO_DAIOCTA_EYE,
|
||||
/* Draw Prio */ fpcDwPi_DAIOCTA_EYE_e,
|
||||
/* Actor SubMtd */ &daDaiocta_EyeMethodTable,
|
||||
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
|
||||
/* Group */ fopAc_ACTOR_e,
|
||||
/* CullType */ fopAc_CULLBOX_4_e,
|
||||
/* Cull Type */ fopAc_CULLBOX_4_e,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user