mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-18 13:13:29 -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:
@@ -6,8 +6,6 @@
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
#include "d/actor/d_a_obj_stair.h"
|
||||
#include "d/d_bg_w.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "d/d_priority.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "d/res/res_mkdan.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -73,7 +71,7 @@ daobj_stairHIO_c::daobj_stairHIO_c() {
|
||||
/* 00000130-000001D8 .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
|
||||
void ride_call_back(dBgW* i_arg0, fopAc_ac_c* i_arg1, fopAc_ac_c* i_arg2) {
|
||||
daObj_Stair_c* i_this = (daObj_Stair_c*)i_arg1;
|
||||
if (fopAcM_GetProfName(i_arg2) == PROC_PLAYER && i_this->field_0x2E0 < l_HIO.m18){
|
||||
if (fopAcM_GetProfName(i_arg2) == fpcNm_PLAYER_e && i_this->field_0x2E0 < l_HIO.m18){
|
||||
i_this->field_0x2E4 = 1;
|
||||
i_this->field_0x2C8.set(i_arg2->current.pos - i_arg1->current.pos);
|
||||
i_this->field_0x2D4.set(0.0f, -1.0f, 0.0f);
|
||||
@@ -270,7 +268,7 @@ bool daObj_Stair_c::_execute() {
|
||||
if(mCps.ChkTgHit()) {
|
||||
fopAc_ac_c* ac = mCps.GetTgHitAc();
|
||||
if(ac) {
|
||||
if(fopAcM_IsActor(ac) && fopAcM_GetProfName(ac) == PROC_BOMB){
|
||||
if(fopAcM_IsActor(ac) && fopAcM_GetProfName(ac) == fpcNm_BOMB_e){
|
||||
sin = cM_ssin(current.angle.y);
|
||||
cos = cM_scos(current.angle.y);
|
||||
field_0x2E4 = 1;
|
||||
@@ -357,18 +355,18 @@ static actor_method_class daObj_StairMethodTable = {
|
||||
};
|
||||
|
||||
actor_process_profile_definition g_profile_Obj_Stair = {
|
||||
/* LayerID */ fpcLy_CURRENT_e,
|
||||
/* ListID */ 0x0003,
|
||||
/* ListPrio */ fpcPi_CURRENT_e,
|
||||
/* ProcName */ PROC_Obj_Stair,
|
||||
/* Layer ID */ fpcLy_CURRENT_e,
|
||||
/* List ID */ 0x0003,
|
||||
/* List Prio */ fpcPi_CURRENT_e,
|
||||
/* Proc Name */ fpcNm_Obj_Stair_e,
|
||||
/* Proc SubMtd */ &g_fpcLf_Method.base,
|
||||
/* Size */ sizeof(daObj_Stair_c),
|
||||
/* SizeOther */ 0,
|
||||
/* Size Other */ 0,
|
||||
/* Parameters */ 0,
|
||||
/* Leaf SubMtd */ &g_fopAc_Method.base,
|
||||
/* Priority */ PRIO_Obj_Stair,
|
||||
/* Draw Prio */ fpcDwPi_Obj_Stair_e,
|
||||
/* Actor SubMtd */ &daObj_StairMethodTable,
|
||||
/* Status */ fopAcStts_UNK40000_e,
|
||||
/* Group */ fopAc_ENV_e,
|
||||
/* CullType */ fopAc_CULLBOX_0_e,
|
||||
/* Cull Type */ fopAc_CULLBOX_0_e,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user