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_beam.cpp
+13 -15
View File
@@ -11,8 +11,6 @@
#include "d/d_cc_d.h"
#include "d/d_lib.h"
#include "d/d_particle.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_a_obj.h"
#include "d/d_s_play.h"
#include "f_op/f_op_actor_mng.h"
@@ -158,7 +156,7 @@ void daBeam_AtHitCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c* arg2
daBeam_c* i_this = (daBeam_c*)arg0;
if (fopAcM_IsActor(arg2)) {
if (fopAcM_GetName(arg2) == PROC_PLAYER) {
if (fopAcM_GetName(arg2) == fpcNm_PLAYER_e) {
fopAcM_seStartCurrent(arg2, JA_SE_LK_BEAM_HIT, 0);
if (i_this->m54C != 0) {
@@ -173,7 +171,7 @@ void daBeam_AtHitCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c* arg2
arg1->SetAtVec(sp20);
arg3->SetTgRVec(sp20);
}
} else if (fopAcM_GetName(arg2) == PROC_AM2) {
} else if (fopAcM_GetName(arg2) == fpcNm_AM2_e) {
arg3->ClrTgHit();
}
@@ -189,7 +187,7 @@ void daBeam_AtHitDummyCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c*
daBeam_c* i_this = (daBeam_c*)arg0;
if (fopAcM_IsActor(arg2)) {
if (fopAcM_GetName(arg2) == PROC_PLAYER) {
if (fopAcM_GetName(arg2) == fpcNm_PLAYER_e) {
fopAcM_seStartCurrent(arg2, JA_SE_LK_BEAM_HIT, 0);
if (i_this->m54C != 0) {
@@ -203,7 +201,7 @@ void daBeam_AtHitDummyCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c*
arg1->SetAtVec(sp20);
arg3->SetTgRVec(sp20);
}
} else if (fopAcM_GetName(arg2) == PROC_AM2) {
} else if (fopAcM_GetName(arg2) == fpcNm_AM2_e) {
arg3->ClrTgHit();
}
}
@@ -212,7 +210,7 @@ void daBeam_AtHitDummyCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c*
/* 00000A00-00000AA0 .text daBeam_checkHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
void daBeam_checkHitCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c* arg2, dCcD_GObjInf* arg3) {
if (fopAcM_IsActor(arg2) && arg0->parentActorID != fopAcM_GetID(arg2)) {
if (fopAcM_GetName(arg2) != PROC_PLAYER || arg1->ChkAtShieldHit()) {
if (fopAcM_GetName(arg2) != fpcNm_PLAYER_e || arg1->ChkAtShieldHit()) {
daBeam_c* i_this = (daBeam_c*)arg0;
i_this->m540 = *i_this->mCps2.GetAtHitPosP();
i_this->m53C = true;
@@ -403,7 +401,7 @@ bool daBeam_c::_execute() {
parameters |= 2;
}
m684 = fopAcM_create(PROC_Hot_Floor, parameters, &m668);
m684 = fopAcM_create(fpcNm_Hot_Floor_e, parameters, &m668);
}
m688 = 1.0f;
} else {
@@ -658,18 +656,18 @@ static actor_method_class daBeamMethodTable = {
};
actor_process_profile_definition g_profile_Beam = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Beam,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Beam_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBeam_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Beam,
/* Draw Prio */ fpcDwPi_Beam_e,
/* Actor SubMtd */ &daBeamMethodTable,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};