mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-29 00:22:09 -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_arrow.cpp
+25 -27
View File
@@ -7,8 +7,6 @@
#include "d/actor/d_a_arrow.h"
#include "m_Do/m_Do_mtx.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_item_data.h"
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_player_main.h"
@@ -142,7 +140,7 @@ void daArrow_c::checkCreater() {
// Check if this arrow was fired by Princess Zelda (during the Ganondorf fight).
fopAc_ac_c* archer;
if (fopAcM_SearchByID(fopAcM_GetLinkId(this), &archer)) {
if (fpcM_GetName(archer) == PROC_PZ) {
if (fpcM_GetName(archer) == fpcNm_PZ_e) {
mbSetByZelda = true;
}
}
@@ -156,7 +154,7 @@ void daArrow_c::setLightEffect() {
}
if (!mbHasLightEff) {
mLightEffPID = fopAcM_createChild(
PROC_ARROW_LIGHTEFF, fopAcM_GetID(this),
fpcNm_ARROW_LIGHTEFF_e, fopAcM_GetID(this),
mArrowType, &field_0x6a8,
current.roomNo, &shape_angle
);
@@ -326,7 +324,7 @@ void daArrow_c::ShieldReflect() {
s16 targetAngleX = link->getBodyAngleX();
fopAc_ac_c* ganondorf;
if (fopAcM_SearchByName(PROC_GND, &ganondorf)) {
if (fopAcM_SearchByName(fpcNm_GND_e, &ganondorf)) {
dAttention_c& attention = dComIfGp_getAttention();
if (attention.LockonTruth() && attention.LockonTarget(0) == ganondorf) {
cXyz ganondorfChestPos = ganondorf->current.pos;
@@ -393,7 +391,7 @@ bool daArrow_c::check_water_in() {
} else if (mArrowType == TYPE_ICE) {
mInWaterTimer = 10*30;
fopAcM_createChild(
PROC_ARROW_ICEEFF, fopAcM_GetID(this), mArrowType,
fpcNm_ARROW_ICEEFF_e, fopAcM_GetID(this), mArrowType,
&waterHitPos, current.roomNo, &current.angle
);
#if VERSION > VERSION_DEMO
@@ -438,19 +436,19 @@ daArrow_c* daArrow_c::changeArrowType() {
daArrow_c* ret = this;
if (mArrowType == TYPE_NORMAL) {
if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(dInvSlot_BOW_e) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e)) {
if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e)) {
mArrowType = TYPE_NORMAL;
} else {
mArrowType = TYPE_FIRE;
}
} else if (mArrowType == TYPE_FIRE) {
if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(dInvSlot_BOW_e) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e)) {
if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e)) {
mArrowType = TYPE_NORMAL;
} else {
mArrowType = TYPE_ICE;
}
} else if (mArrowType == TYPE_ICE) {
if (dComIfGs_getMagic() < 2 || dComIfGs_getItem(dInvSlot_BOW_e) != dItem_LIGHT_ARROW_e) {
if (dComIfGs_getMagic() < 2 || dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_LIGHT_ARROW_e) {
mArrowType = TYPE_NORMAL;
} else {
mArrowType = TYPE_LIGHT;
@@ -461,7 +459,7 @@ daArrow_c* daArrow_c::changeArrowType() {
if (mArrowType != origArrowType) {
m_keep_type = mArrowType;
daArrow_c* newNockedArrow = (daArrow_c*)fopAcM_fastCreate(PROC_ARROW, 0, &current.pos, fopAcM_GetRoomNo(this));
daArrow_c* newNockedArrow = (daArrow_c*)fopAcM_fastCreate(fpcNm_ARROW_e, 0, &current.pos, fopAcM_GetRoomNo(this));
if (!newNockedArrow) {
mArrowType = origArrowType;
m_keep_type = origArrowType;
@@ -483,18 +481,18 @@ void daArrow_c::changeArrowTypeNotReady() {
if (dComIfGs_getMagic() < 1) {
return;
}
if (dComIfGs_getItem(dInvSlot_BOW_e) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e) {
if (dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e) {
m_keep_type = TYPE_FIRE;
}
} else if (m_keep_type == TYPE_FIRE) {
if (dComIfGs_getMagic() < 1) {
return;
}
if (dComIfGs_getItem(dInvSlot_BOW_e) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e) {
if (dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e) {
m_keep_type = TYPE_ICE;
}
} else if (m_keep_type == TYPE_ICE) {
if (dComIfGs_getMagic() >= 2 && dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e) {
if (dComIfGs_getMagic() >= 2 && dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e) {
m_keep_type = TYPE_LIGHT;
} else {
m_keep_type = TYPE_NORMAL;
@@ -630,7 +628,7 @@ BOOL daArrow_c::procMove() {
cXyz temp12;
cXyz hitPos;
csXyz temp11;
if (mArrowType == TYPE_LIGHT && !mbLinkReflect && mAtCps.ChkAtShieldHit() && fpcM_GetName(mAtCps.GetAtHitAc()) == PROC_PLAYER) {
if (mArrowType == TYPE_LIGHT && !mbLinkReflect && mAtCps.ChkAtShieldHit() && fpcM_GetName(mAtCps.GetAtHitAc()) == fpcNm_PLAYER_e) {
mAtCps.GetAtHitAc();
hitPos = *mAtCps.GetAtHitPosP();
hitType = -1; // Reflected hit
@@ -653,9 +651,9 @@ BOOL daArrow_c::procMove() {
if (hitActor) {
JntHit_c* jntHit = fopAcM_GetJntHit(hitActor);
if (mArrowType == TYPE_LIGHT) {
if (fpcM_GetName(mAtCps.GetAtHitAc()) == PROC_BGN ||
fpcM_GetName(mAtCps.GetAtHitAc()) == PROC_BGN2 ||
fpcM_GetName(mAtCps.GetAtHitAc()) == PROC_BGN3) {
if (fpcM_GetName(mAtCps.GetAtHitAc()) == fpcNm_BGN_e ||
fpcM_GetName(mAtCps.GetAtHitAc()) == fpcNm_BGN2_e ||
fpcM_GetName(mAtCps.GetAtHitAc()) == fpcNm_BGN3_e) {
// Hit Puppet Ganon.
if (hitWasBlocked) {
field_0x6a8 = hitPos;
@@ -794,12 +792,12 @@ BOOL daArrow_c::procMove() {
field_0x698 = false;
} else if (mArrowType == TYPE_ICE) {
if (dComIfG_Bgsp()->ChkGrpInf(mLinChk, 0x200)) {
fopAcM_create(PROC_Obj_Magmarock, NULL, &field_0x6a8, current.roomNo);
fopAcM_create(fpcNm_Obj_Magmarock_e, NULL, &field_0x6a8, current.roomNo);
} else {
dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWI_HITA00, &field_0x6a8, &temp10);
fopAcM_createChild(
PROC_ARROW_ICEEFF, fopAcM_GetID(this),
fpcNm_ARROW_ICEEFF_e, fopAcM_GetID(this),
mArrowType, &field_0x6a8,
current.roomNo, &field_0x6e6
);
@@ -977,7 +975,7 @@ BOOL daArrow_c::procStop_BG() {
if (mCoSph.ChkCoHit()) {
dComIfGp_setItemArrowNumCount(1);
fopAcM_createItemForSimpleDemo(&current.pos, dItem_ARROW_10_e, -1, NULL, NULL, 0.0f, 0.0f);
fopAcM_createItemForSimpleDemo(&current.pos, dItemNo_ARROW_10_e, -1, NULL, NULL, 0.0f, 0.0f);
mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET);
fopAcM_delete(this);
return TRUE;
@@ -1287,18 +1285,18 @@ static actor_method_class daArrowMethodTable = {
};
actor_process_profile_definition g_profile_ARROW = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0009,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ARROW,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0009,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ARROW_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daArrow_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_ARROW,
/* Draw Prio */ fpcDwPi_ARROW_e,
/* Actor SubMtd */ &daArrowMethodTable,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};