mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 21:18:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Process profiles and enums cleanup (#1031)

Browse Source 
* 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:
LagoLunatic
2026-05-26 00:11:58 -04:00
committed by GitHub
parent 79277cb2b2
commit 102042628f
540 changed files with 9562 additions and 10530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_canon.cpp
+9 -11
View File
@@ -13,14 +13,12 @@
#include "d/d_cc_uty.h"
#include "d/d_com_inf_game.h"
#include "d/d_path.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/actor/d_a_bomb.h"
#include "d/d_s_play.h"
#include "d/res/res_wallbom.h"
daObj_Canon_HIO_c l_HIO;
static daObj_Canon_HIO_c l_HIO;
const u32 daObj_Canon_c::m_heapsize = 0x8C0;
const char daObj_Canon_c::m_arc_name[] = "WallBom";
@@ -240,7 +238,7 @@ bool daObj_Canon_c::checkTgHit() {
void daObj_Canon_c::attackCannon() {
csXyz angle;
angle.set(shape_angle.x - field_0x2CA, shape_angle.y + field_0x2C6, shape_angle.z);
daBomb_c* bomb = (daBomb_c*)fopAcM_fastCreate(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_4, true, true), &field_0x450, tevStr.mRoomNo, &angle);
daBomb_c* bomb = (daBomb_c*)fopAcM_fastCreate(fpcNm_BOMB_e, daBomb_c::prm_make(daBomb_c::STATE_4, true, true), &field_0x450, tevStr.mRoomNo, &angle);
bomb->setNoGravityTime(l_HIO.field_0x28);
bomb->speedF = l_HIO.field_0x20 * cM_scos(angle.x);
bomb->speed.y = -(l_HIO.field_0x20 * cM_ssin(angle.x));
@@ -646,18 +644,18 @@ static actor_method_class daObj_CanonMethodTable = {
};
actor_process_profile_definition g_profile_OBJ_CANON = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0003,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_OBJ_CANON,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0003,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_OBJ_CANON_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daObj_Canon_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_OBJ_CANON,
/* Draw Prio */ fpcDwPi_OBJ_CANON_e,
/* Actor SubMtd */ &daObj_CanonMethodTable,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};