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,9 +10,7 @@
|
||||
#include "d/actor/d_a_npc_mt.h"
|
||||
#include "d/d_kankyo.h"
|
||||
#include "d/res/res_knob.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "m_Do/m_Do_graphic.h"
|
||||
#include "d/d_priority.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "ctype.h"
|
||||
|
||||
@@ -356,7 +354,7 @@ BOOL daKnob00_c::CreateInit() {
|
||||
mDoorType = getType();
|
||||
if (getShapeType() == 4 && mDoorType == 1) {
|
||||
mDoorType = 5;
|
||||
fopAcM_create(PROC_TAG_MK, 0xffffff03, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, 0, NULL);
|
||||
fopAcM_create(fpcNm_TAG_MK_e, 0xffffff03, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, 0, NULL);
|
||||
attention_info.position.y += 60.0f;
|
||||
eyePos.y += 60.0f;
|
||||
}
|
||||
@@ -716,7 +714,7 @@ BOOL daKnob00_c::actionInit() {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
if (dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) {
|
||||
if (dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e)) {
|
||||
setAction(11);
|
||||
return TRUE;
|
||||
}
|
||||
@@ -780,7 +778,7 @@ BOOL daKnob00_c::draw() {
|
||||
fpc_ProcID iVar1 = fopAcM_GetLinkId(this);
|
||||
if (iVar1 != fpcM_ERROR_PROCESS_ID_e) {
|
||||
fopAc_ac_c* ac = fopAcM_SearchByID(iVar1);
|
||||
if (fopAcM_IsActor(ac) && fopAcM_GetName(ac) == PROC_Obj_Pirateship) {
|
||||
if (fopAcM_IsActor(ac) && fopAcM_GetName(ac) == fpcNm_Obj_Pirateship_e) {
|
||||
daObjPirateship::Act_c* pirateShip = (daObjPirateship::Act_c*)ac;
|
||||
if (pirateShip->m2CC == 0) {
|
||||
return TRUE;
|
||||
@@ -929,18 +927,18 @@ static actor_method_class l_daKnob00_Method = {
|
||||
};
|
||||
|
||||
actor_process_profile_definition g_profile_KNOB00 = {
|
||||
/* LayerID */ fpcLy_CURRENT_e,
|
||||
/* ListID */ 0x0007,
|
||||
/* ListPrio */ fpcPi_CURRENT_e,
|
||||
/* ProcName */ PROC_KNOB00,
|
||||
/* Layer ID */ fpcLy_CURRENT_e,
|
||||
/* List ID */ 0x0007,
|
||||
/* List Prio */ fpcPi_CURRENT_e,
|
||||
/* Proc Name */ fpcNm_KNOB00_e,
|
||||
/* Proc SubMtd */ &g_fpcLf_Method.base,
|
||||
/* Size */ sizeof(daKnob00_c),
|
||||
/* SizeOther */ 0,
|
||||
/* Size Other */ 0,
|
||||
/* Parameters */ 0,
|
||||
/* Leaf SubMtd */ &g_fopAc_Method.base,
|
||||
/* Priority */ PRIO_KNOB00,
|
||||
/* Draw Prio */ fpcDwPi_KNOB00_e,
|
||||
/* Actor SubMtd */ &l_daKnob00_Method,
|
||||
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
|
||||
/* Group */ fopAc_ACTOR_e,
|
||||
/* CullType */ fopAc_CULLBOX_6_e,
|
||||
/* Cull Type */ fopAc_CULLBOX_6_e,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user