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:
+10
-12
@@ -8,8 +8,6 @@
|
||||
#include "d/actor/d_a_player.h"
|
||||
#include "d/actor/d_a_dai_item.h"
|
||||
#include "d/res/res_fdai.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "d/d_priority.h"
|
||||
#include "d/d_item.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
@@ -102,9 +100,9 @@ void daDai_c::CreateInit() {
|
||||
|
||||
if (dComIfGs_getEventReg(m_savelabel[mSaveID])) {
|
||||
#if VERSION <= VERSION_JPN
|
||||
void* pfVar3 = fopAcM_fastCreate(PROC_STANDITEM, dComIfGs_getEventReg(m_savelabel[mSaveID]), ¤t.pos, -1, ¤t.angle);
|
||||
void* pfVar3 = fopAcM_fastCreate(fpcNm_STANDITEM_e, dComIfGs_getEventReg(m_savelabel[mSaveID]), ¤t.pos, -1, ¤t.angle);
|
||||
#else
|
||||
void* pfVar3 = fopAcM_fastCreate(PROC_STANDITEM, dComIfGs_getEventReg(m_savelabel[mSaveID]), ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle);
|
||||
void* pfVar3 = fopAcM_fastCreate(fpcNm_STANDITEM_e, dComIfGs_getEventReg(m_savelabel[mSaveID]), ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle);
|
||||
#endif
|
||||
m850 = fopAcM_GetID(pfVar3);
|
||||
incNowItemNum();
|
||||
@@ -116,7 +114,7 @@ void daDai_c::CreateInit() {
|
||||
cPhs_State daDai_c::_create() {
|
||||
fopAcM_ct(this, daDai_c);
|
||||
|
||||
if (!checkItemGet(dItem_DELIVERY_BAG_e, TRUE)) {
|
||||
if (!checkItemGet(dItemNo_DELIVERY_BAG_e, TRUE)) {
|
||||
return cPhs_ERROR_e;
|
||||
}
|
||||
|
||||
@@ -375,18 +373,18 @@ static actor_method_class daDaiMethodTable = {
|
||||
};
|
||||
|
||||
actor_process_profile_definition g_profile_DAI = {
|
||||
/* LayerID */ fpcLy_CURRENT_e,
|
||||
/* ListID */ 0x0007,
|
||||
/* ListPrio */ fpcPi_CURRENT_e,
|
||||
/* ProcName */ PROC_DAI,
|
||||
/* Layer ID */ fpcLy_CURRENT_e,
|
||||
/* List ID */ 0x0007,
|
||||
/* List Prio */ fpcPi_CURRENT_e,
|
||||
/* Proc Name */ fpcNm_DAI_e,
|
||||
/* Proc SubMtd */ &g_fpcLf_Method.base,
|
||||
/* Size */ sizeof(daDai_c),
|
||||
/* SizeOther */ 0,
|
||||
/* Size Other */ 0,
|
||||
/* Parameters */ 0,
|
||||
/* Leaf SubMtd */ &g_fopAc_Method.base,
|
||||
/* Priority */ PRIO_DAI,
|
||||
/* Draw Prio */ fpcDwPi_DAI_e,
|
||||
/* Actor SubMtd */ &daDaiMethodTable,
|
||||
/* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e,
|
||||
/* Group */ fopAc_ACTOR_e,
|
||||
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
|
||||
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user