mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-05 04:49:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix collision struct formatting

Browse Source
This commit is contained in:
LagoLunatic
2025-08-22 23:26:48 -04:00
parent 77cc6a6119
commit bc74b63d11
26 changed files with 120 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_arrow.cpp
+4 -4
View File
@@ -44,11 +44,11 @@ const dCcD_SrcCps daArrow_c::m_at_cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 5.0f,
},
}},
};
const dCcD_SrcSph daArrow_c::m_co_sph_src = {
src/d/actor/d_a_beam.cpp
+4 -8
View File
@@ -42,15 +42,11 @@ static dCcD_SrcCps cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f,
0.0f,
0.0f,
/* End */ 0.0f,
0.0f,
0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 50.0f,
},
}},
};
static dCcD_SrcCps cps2_src = {
src/d/actor/d_a_bflower.cpp
+4 -4
View File
@@ -36,12 +36,12 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e,
/* SrcGObjCo SPrm */ 0,
},
// cCcD_SrcCylAttr
{
/* Center */ 0.0f, 0.0f, 0.0f,
// cM3dGCylS
{{
/* Center */ {0.0f, 0.0f, 0.0f},
/* Radius */ 50.0f,
/* Height */ 10.0f,
}
}},
};
static dCcD_SrcSph l_sph_src = {
src/d/actor/d_a_boko.cpp
+4 -4
View File
@@ -161,11 +161,11 @@ static dCcD_SrcCps at_cps_src = {
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 20.0f,
},
}},
};
const s16 daBoko_HIO_c0::throw_timer = 2;
src/d/actor/d_a_boomerang.cpp
+4 -4
View File
@@ -35,11 +35,11 @@ static dCcD_SrcCps l_at_cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 3.0f,
},
}},
};
src/d/actor/d_a_daiocta.cpp
+4 -4
View File
@@ -62,11 +62,11 @@ const dCcD_SrcCps daDaiocta_c::m_cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 60.0f,
},
}},
};
src/d/actor/d_a_deku_item.cpp
+5 -4
View File
@@ -34,12 +34,13 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e,
/* SrcGObjCo SPrm */ 0,
},
// cCcD_SrcCylAttr
{
/* Center */ 0.0f, 0.0f, 0.0f,
// cM3dGCylS
{{
/* Center */ {0.0f, 0.0f, 0.0f},
/* Radius */ 50.0f,
/* Height */ 100.0f,
}};
}},
};
/* 00000078-000000D0 .text _delete__12daDekuItem_cFv */
bool daDekuItem_c::_delete() {
src/d/actor/d_a_fan.cpp
+4 -4
View File
@@ -51,11 +51,11 @@ static dCcD_SrcCps l_cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 100.0f,
},
}},
};
/* 00000078-000000F0 .text Delete__7daFan_cFv */
src/d/actor/d_a_gy.cpp
+4 -4
View File
@@ -92,11 +92,11 @@ static dCcD_SrcCps l_cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 60.0f,
},
}},
};
src/d/actor/d_a_hookshot.cpp
+4 -4
View File
@@ -534,11 +534,11 @@ static dCcD_SrcCps l_at_cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 5.0f,
},
}},
};
/* 800F2C14-800F2CC8 .text create__12daHookshot_cFv */
src/d/actor/d_a_mozo.cpp
+4 -4
View File
@@ -41,11 +41,11 @@ static dCcD_SrcCps cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 50.0f,
},
}},
};
src/d/actor/d_a_npc_ji1.cpp
+4 -4
View File
@@ -137,11 +137,11 @@ static dCcD_SrcCps l_cpsAt_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 80.0f,
},
}},
};
/* 000000EC-00000380 .text __ct__15daNpc_Ji1_HIO_cFv */
src/d/actor/d_a_npc_kamome.cpp
+4 -4
View File
@@ -410,11 +410,11 @@ static dCcD_SrcCps l_kam_at_cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 20.0f,
},
}},
};
static char* event_name_tbl[] = {
src/d/actor/d_a_npc_md.cpp
+4 -4
View File
@@ -123,11 +123,11 @@ static dCcD_SrcCps l_fan_light_cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 70.0f,
},
}},
};
static dCcD_SrcCyl l_wind_cyl_src = {
src/d/actor/d_a_obj_doguu.cpp
+4 -4
View File
@@ -36,12 +36,12 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcGObjTg SPrm */ cCcD_TgSPrm_IsPlayer_e,
/* SrcGObjCo SPrm */ 0,
},
// cCcD_SrcCylAttr
{
/* Center */ 0.0f, 0.0f, 0.0f,
// cM3dGCylS
{{
/* Center */ {0.0f, 0.0f, 0.0f},
/* Radius */ 200.0f,
/* Height */ 200.0f,
}
}},
};
const struct {
src/d/actor/d_a_obj_ebomzo.cpp
+4 -5
View File
@@ -43,12 +43,11 @@ dCcD_SrcSph sph_check_src = {
/* SrcGObjTg SPrm */ 0,
/* SrcGObjCo SPrm */ 0,
},
//cCcD_SrcSphAttr
{
/* Center */ 0.0f, 0.0f, 0.0f,
// cM3dGSphS
{{
/* Center */ {0.0f, 0.0f, 0.0f},
/* Radius */ 10.0f,
}
}},
};
/* 00000078-0000012C .text CreateHeap__Q211daObjEbomzo5Act_cFv */
src/d/actor/d_a_obj_homen.cpp
+8 -8
View File
@@ -166,11 +166,11 @@ const dCcD_SrcCps Act_c::M_cps_srcL = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 135.0f,
},
}},
};
const dCcD_SrcCps Act_c::M_cps_srcS = {
@@ -196,11 +196,11 @@ const dCcD_SrcCps Act_c::M_cps_srcS = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 45.0f,
},
}},
};
/* 000000EC-00000110 .text solidHeapCB__Q210daObjHomen5Act_cFP10fopAc_ac_c */
src/d/actor/d_a_obj_kanoke.cpp
+8 -8
View File
@@ -32,11 +32,11 @@ static dCcD_SrcCps l_cps_src_body = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 50.0f, -100.0f,
/* End */ 0.0f, 50.0f, 100.0f,
{{
/* Start */ {0.0f, 50.0f, -100.0f},
/* End */ {0.0f, 50.0f, 100.0f},
/* Radius */ 100.0f,
},
}},
};
@@ -63,11 +63,11 @@ static dCcD_SrcCps l_cps_src_huta = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 50.0f, -100.0f,
/* End */ 0.0f, 50.0f, 100.0f,
{{
/* Start */ {0.0f, 50.0f, -100.0f},
/* End */ {0.0f, 50.0f, 100.0f},
/* Radius */ 25.0f,
},
}},
};
src/d/actor/d_a_obj_search.cpp
+4 -4
View File
@@ -32,11 +32,11 @@ static dCcD_SrcCps cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 50.0f,
},
}},
};
src/d/actor/d_a_obj_stair.cpp
+4 -4
View File
@@ -33,11 +33,11 @@ static dCcD_SrcCps cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 50.0f,
},
}},
};
src/d/actor/d_a_player_main_data.inc
+8 -8
View File
@@ -153,11 +153,11 @@ static dCcD_SrcCps l_at_cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 20.0f,
},
}},
};
static dCcD_SrcCps l_fan_wind_cps_src = {
@@ -183,11 +183,11 @@ static dCcD_SrcCps l_fan_wind_cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 70.0f,
},
}},
};
static dCcD_SrcSph l_fan_wind_sph_src = {
src/d/actor/d_a_steam_tag.cpp
+4 -4
View File
@@ -37,11 +37,11 @@ static dCcD_SrcCps l_cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 200.0f,
},
}},
};
daSteamTag_mData daSteamTag_c::mData = {
src/d/actor/d_a_toge.cpp
+5 -4
View File
@@ -40,12 +40,13 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e,
/* SrcGObjCo SPrm */ 0,
},
// cCcD_SrcCylAttr
{
/* Center */ 0.0f, 0.0f, 0.0f,
// cM3dGCylS
{{
/* Center */ {0.0f, 0.0f, 0.0f},
/* Radius */ 55.0f,
/* Height */ 150.0f,
}};
}},
};
/* 00000078-0000013C .text _delete__8daToge_cFv */
BOOL daToge_c::_delete() {
src/d/actor/d_a_wall.cpp
+5 -5
View File
@@ -76,11 +76,11 @@ static dCcD_SrcTri l_tri_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGTriS
{
/* a */ 0.0f, 0.0f, 0.0f,
/* b */ 0.0f, 0.0f, 0.0f,
/* c */ 0.0f, 0.0f, 0.0f,
},
{{
/* a */ {0.0f, 0.0f, 0.0f},
/* b */ {0.0f, 0.0f, 0.0f},
/* c */ {0.0f, 0.0f, 0.0f},
}},
};
/* 00000078-00000100 .text _delete__8daWall_cFv */
src/d/actor/d_a_wind_tag.cpp
+5 -5
View File
@@ -40,11 +40,11 @@ namespace daWindTag {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* P0 */ 0.0f, 0.0f, 0.0f,
/* P1 */ 0.0f, 0.0f, 0.0f,
/* Height */ 200.0f,
},
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 200.0f,
}},
};
}
src/d/actor/d_a_windmill.cpp
+4 -4
View File
@@ -70,11 +70,11 @@ static dCcD_SrcCps l_cps_src = {
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
{
/* Start */ 0.0f, 0.0f, 0.0f,
/* End */ 0.0f, 0.0f, 0.0f,
{{
/* Start */ {0.0f, 0.0f, 0.0f},
/* End */ {0.0f, 0.0f, 0.0f},
/* Radius */ 200.0f,
},
}},
};