mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-18 05:08:57 -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:
+10
-12
@@ -10,8 +10,6 @@
|
||||
#include "d/actor/d_a_bomb2.h"
|
||||
#include "d/actor/d_a_sea.h"
|
||||
#include "JSystem/J3DGraphAnimator/J3DModel.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "d/d_priority.h"
|
||||
#include "d/d_s_play.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
@@ -248,12 +246,12 @@ void* bom_search_sub(void* ac, void*) {
|
||||
bool bVar2 = false;
|
||||
s16 proc = fopAcM_GetName(ac);
|
||||
|
||||
if (proc == PROC_BOMB) {
|
||||
if (proc == fpcNm_BOMB_e) {
|
||||
daBomb_c* bomb = (daBomb_c*)ac;
|
||||
if (bomb->chk_state(daBomb_c::STATE_0)) {
|
||||
bVar2 = true;
|
||||
}
|
||||
} else if (proc == PROC_Bomb2) {
|
||||
} else if (proc == fpcNm_Bomb2_e) {
|
||||
daBomb2::Act_c* bomb2 = (daBomb2::Act_c*)ac;
|
||||
if (bomb2->chk_explode()) {
|
||||
bVar2 = true;
|
||||
@@ -357,7 +355,7 @@ void cut_point_check(kanban_class* i_this) {
|
||||
dScnPly_ply_c::setPauseTimer(1);
|
||||
a_this->current.angle.z = i_this->m2C4;
|
||||
|
||||
fpc_ProcID fVar6 = fopAcM_createChild(PROC_KANBAN, fopAcM_GetID(a_this), parameters, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->current.angle, &a_this->scale, 0, NULL);
|
||||
fpc_ProcID fVar6 = fopAcM_createChild(fpcNm_KANBAN_e, fopAcM_GetID(a_this), parameters, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->current.angle, &a_this->scale, 0, NULL);
|
||||
if (fVar6 != fpcM_ERROR_PROCESS_ID_e) {
|
||||
fopAcM_seStart(a_this, JA_SE_OBJ_BREAK_BOARD, 0);
|
||||
|
||||
@@ -1174,18 +1172,18 @@ static actor_method_class l_daKanban_Method = {
|
||||
};
|
||||
|
||||
actor_process_profile_definition g_profile_KANBAN = {
|
||||
/* LayerID */ fpcLy_CURRENT_e,
|
||||
/* ListID */ 0x0007,
|
||||
/* ListPrio */ fpcPi_CURRENT_e,
|
||||
/* ProcName */ PROC_KANBAN,
|
||||
/* Layer ID */ fpcLy_CURRENT_e,
|
||||
/* List ID */ 0x0007,
|
||||
/* List Prio */ fpcPi_CURRENT_e,
|
||||
/* Proc Name */ fpcNm_KANBAN_e,
|
||||
/* Proc SubMtd */ &g_fpcLf_Method.base,
|
||||
/* Size */ sizeof(kanban_class),
|
||||
/* SizeOther */ 0,
|
||||
/* Size Other */ 0,
|
||||
/* Parameters */ 0,
|
||||
/* Leaf SubMtd */ &g_fopAc_Method.base,
|
||||
/* Priority */ PRIO_KANBAN,
|
||||
/* Draw Prio */ fpcDwPi_KANBAN_e,
|
||||
/* Actor SubMtd */ &l_daKanban_Method,
|
||||
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
|
||||
/* Group */ fopAc_ACTOR_e,
|
||||
/* CullType */ fopAc_CULLBOX_0_e,
|
||||
/* Cull Type */ fopAc_CULLBOX_0_e,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user