mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-17 21:03:35 -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:
@@ -7,9 +7,7 @@
|
||||
#include "d/actor/d_a_obj_pirateship.h"
|
||||
#include "d/actor/d_a_knob00.h"
|
||||
#include "d/res/res_kaizokusen.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "d/d_particle.h"
|
||||
#include "d/d_priority.h"
|
||||
#include "d/d_path.h"
|
||||
#include "d/d_lib.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -219,14 +217,14 @@ void daObjPirateship::Act_c::partsCreate() {
|
||||
m_sail_id = fopAcM_createChild("Psail", fopAcM_GetID(this), 0, ¤t.pos, tevStr.mRoomNo, ¤t.angle);
|
||||
JUT_ASSERT(282, (m_sail_id != fpcM_ERROR_PROCESS_ID_e));
|
||||
|
||||
m2F0 = fopAcM_createChild(PROC_PIRATE_FLAG, fopAcM_GetID(this), 0, ¤t.pos, tevStr.mRoomNo, ¤t.angle);
|
||||
m2F0 = fopAcM_createChild(fpcNm_PIRATE_FLAG_e, fopAcM_GetID(this), 0, ¤t.pos, tevStr.mRoomNo, ¤t.angle);
|
||||
|
||||
if (uVar2 != 3) {
|
||||
cXyz sp30 = current.pos;
|
||||
sp30.y += 700.0f;
|
||||
sp30.x += cM_ssin(current.angle.y) * 850.0f;
|
||||
sp30.z += cM_scos(current.angle.y) * 850.0f;
|
||||
m2F8 = fopAcM_createChild(PROC_Obj_Tousekiki, fopAcM_GetID(this), 0, &sp30, tevStr.mRoomNo, ¤t.angle);
|
||||
m2F8 = fopAcM_createChild(fpcNm_Obj_Tousekiki_e, fopAcM_GetID(this), 0, &sp30, tevStr.mRoomNo, ¤t.angle);
|
||||
}
|
||||
|
||||
if (uVar2 != 3) {
|
||||
@@ -235,7 +233,7 @@ void daObjPirateship::Act_c::partsCreate() {
|
||||
sp24.x += cM_ssin(current.angle.y) * -788.0f;
|
||||
sp24.z += cM_scos(current.angle.y) * -788.0f;
|
||||
|
||||
m300 = fopAcM_createChild(PROC_Kaji, fopAcM_GetID(this), 0, &sp24, tevStr.mRoomNo, ¤t.angle);
|
||||
m300 = fopAcM_createChild(fpcNm_Kaji_e, fopAcM_GetID(this), 0, &sp24, tevStr.mRoomNo, ¤t.angle);
|
||||
}
|
||||
|
||||
cXyz sp18 = current.pos;
|
||||
@@ -252,7 +250,7 @@ void daObjPirateship::Act_c::partsCreate() {
|
||||
sp18.x += cM_ssin(current.angle.y) * 475.0f;
|
||||
sp18.z += cM_scos(current.angle.y) * 475.0f;
|
||||
|
||||
m308 = fopAcM_createChild(PROC_KNOB00, fopAcM_GetID(this), dr_prm[uVar3], &sp18, tevStr.mRoomNo, &sp10);
|
||||
m308 = fopAcM_createChild(fpcNm_KNOB00_e, fopAcM_GetID(this), dr_prm[uVar3], &sp18, tevStr.mRoomNo, &sp10);
|
||||
m304 = NULL;
|
||||
}
|
||||
|
||||
@@ -595,18 +593,18 @@ actor_method_class daObjPirateship::Method::Table = {
|
||||
};
|
||||
|
||||
actor_process_profile_definition g_profile_Obj_Pirateship = {
|
||||
/* LayerID */ fpcLy_CURRENT_e,
|
||||
/* ListID */ 0x0003,
|
||||
/* ListPrio */ fpcPi_CURRENT_e,
|
||||
/* ProcName */ PROC_Obj_Pirateship,
|
||||
/* Layer ID */ fpcLy_CURRENT_e,
|
||||
/* List ID */ 0x0003,
|
||||
/* List Prio */ fpcPi_CURRENT_e,
|
||||
/* Proc Name */ fpcNm_Obj_Pirateship_e,
|
||||
/* Proc SubMtd */ &g_fpcLf_Method.base,
|
||||
/* Size */ sizeof(daObjPirateship::Act_c),
|
||||
/* SizeOther */ 0,
|
||||
/* Size Other */ 0,
|
||||
/* Parameters */ 0,
|
||||
/* Leaf SubMtd */ &g_fopAc_Method.base,
|
||||
/* Priority */ PRIO_Obj_Pirateship,
|
||||
/* Draw Prio */ fpcDwPi_Obj_Pirateship_e,
|
||||
/* Actor SubMtd */ &daObjPirateship::Method::Table,
|
||||
/* 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