diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index f21cf77d0..b2f9cfb83 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -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 = { diff --git a/src/d/actor/d_a_beam.cpp b/src/d/actor/d_a_beam.cpp index cedc34bd8..36f10d51e 100644 --- a/src/d/actor/d_a_beam.cpp +++ b/src/d/actor/d_a_beam.cpp @@ -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 = { diff --git a/src/d/actor/d_a_bflower.cpp b/src/d/actor/d_a_bflower.cpp index 2cfb66f76..5b176154d 100644 --- a/src/d/actor/d_a_bflower.cpp +++ b/src/d/actor/d_a_bflower.cpp @@ -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 = { diff --git a/src/d/actor/d_a_boko.cpp b/src/d/actor/d_a_boko.cpp index 0662d8708..de505c563 100644 --- a/src/d/actor/d_a_boko.cpp +++ b/src/d/actor/d_a_boko.cpp @@ -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; diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index f7600af54..a012ab5be 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -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, - }, + }}, }; diff --git a/src/d/actor/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp index b13172a2f..85c003e1b 100644 --- a/src/d/actor/d_a_daiocta.cpp +++ b/src/d/actor/d_a_daiocta.cpp @@ -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, - }, + }}, }; diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index fbd552950..5237609d4 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/src/d/actor/d_a_deku_item.cpp @@ -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() { diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index 1b7a6f052..016b4897e 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -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 */ diff --git a/src/d/actor/d_a_gy.cpp b/src/d/actor/d_a_gy.cpp index ab2d0af76..b1917a979 100644 --- a/src/d/actor/d_a_gy.cpp +++ b/src/d/actor/d_a_gy.cpp @@ -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, - }, + }}, }; diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index 954e34969..9015644e0 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -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 */ diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index 8149f7c1f..7ab39c8de 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/src/d/actor/d_a_mozo.cpp @@ -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, - }, + }}, }; diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 8c859b9df..1935090e7 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -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 */ diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 2ddde3753..615b163a2 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -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[] = { diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index efa57eed3..ab3e3654f 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -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 = { diff --git a/src/d/actor/d_a_obj_doguu.cpp b/src/d/actor/d_a_obj_doguu.cpp index c81b26439..316edb09f 100644 --- a/src/d/actor/d_a_obj_doguu.cpp +++ b/src/d/actor/d_a_obj_doguu.cpp @@ -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 { diff --git a/src/d/actor/d_a_obj_ebomzo.cpp b/src/d/actor/d_a_obj_ebomzo.cpp index 49b4beafa..2ac2fe376 100644 --- a/src/d/actor/d_a_obj_ebomzo.cpp +++ b/src/d/actor/d_a_obj_ebomzo.cpp @@ -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 */ diff --git a/src/d/actor/d_a_obj_homen.cpp b/src/d/actor/d_a_obj_homen.cpp index 0ccf5242a..dc4560c86 100644 --- a/src/d/actor/d_a_obj_homen.cpp +++ b/src/d/actor/d_a_obj_homen.cpp @@ -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 */ diff --git a/src/d/actor/d_a_obj_kanoke.cpp b/src/d/actor/d_a_obj_kanoke.cpp index 3be3e636d..a2d61d8a2 100644 --- a/src/d/actor/d_a_obj_kanoke.cpp +++ b/src/d/actor/d_a_obj_kanoke.cpp @@ -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, - }, + }}, }; diff --git a/src/d/actor/d_a_obj_search.cpp b/src/d/actor/d_a_obj_search.cpp index 4d5835d15..24181d779 100644 --- a/src/d/actor/d_a_obj_search.cpp +++ b/src/d/actor/d_a_obj_search.cpp @@ -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, - }, + }}, }; diff --git a/src/d/actor/d_a_obj_stair.cpp b/src/d/actor/d_a_obj_stair.cpp index 06b229e2a..e5548f4e3 100644 --- a/src/d/actor/d_a_obj_stair.cpp +++ b/src/d/actor/d_a_obj_stair.cpp @@ -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, - }, + }}, }; diff --git a/src/d/actor/d_a_player_main_data.inc b/src/d/actor/d_a_player_main_data.inc index 5f6ba0268..a57866a0a 100644 --- a/src/d/actor/d_a_player_main_data.inc +++ b/src/d/actor/d_a_player_main_data.inc @@ -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 = { diff --git a/src/d/actor/d_a_steam_tag.cpp b/src/d/actor/d_a_steam_tag.cpp index c1c471332..131d2e4df 100644 --- a/src/d/actor/d_a_steam_tag.cpp +++ b/src/d/actor/d_a_steam_tag.cpp @@ -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 = { diff --git a/src/d/actor/d_a_toge.cpp b/src/d/actor/d_a_toge.cpp index b7fb49697..6b1d79eb7 100644 --- a/src/d/actor/d_a_toge.cpp +++ b/src/d/actor/d_a_toge.cpp @@ -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() { diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp index 0bf526612..a040701aa 100644 --- a/src/d/actor/d_a_wall.cpp +++ b/src/d/actor/d_a_wall.cpp @@ -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 */ diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp index 77494dbe6..9917625ab 100644 --- a/src/d/actor/d_a_wind_tag.cpp +++ b/src/d/actor/d_a_wind_tag.cpp @@ -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, + }}, }; } diff --git a/src/d/actor/d_a_windmill.cpp b/src/d/actor/d_a_windmill.cpp index bdf5db2d3..9486fe325 100644 --- a/src/d/actor/d_a_windmill.cpp +++ b/src/d/actor/d_a_windmill.cpp @@ -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, - }, + }}, };