From df6853e91727262e5954917a0ed4da9b5550d7b0 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Wed, 20 Dec 2023 20:05:55 -0500 Subject: [PATCH] fix SrcGObjTg SPrm name in comments --- src/c/c_damagereaction.cpp | 36 +++++----- src/d/actor/d_a_agbsw0.cpp | 18 ++--- src/d/actor/d_a_am.cpp | 72 +++++++++---------- src/d/actor/d_a_am2.cpp | 72 +++++++++---------- src/d/actor/d_a_arrow.cpp | 36 +++++----- src/d/actor/d_a_bomb2.cpp | 18 ++--- src/d/actor/d_a_fan.cpp | 18 ++--- src/d/actor/d_a_hookshot.cpp | 18 ++--- src/d/actor/d_a_ib.cpp | 18 ++--- src/d/actor/d_a_item.cpp | 18 ++--- src/d/actor/d_a_lamp.cpp | 18 ++--- src/d/actor/d_a_nh.cpp | 18 ++--- src/d/actor/d_a_npc_kamome.cpp | 54 +++++++-------- src/d/actor/d_a_npc_md.cpp | 72 +++++++++---------- src/d/actor/d_a_obj_barrier.cpp | 36 +++++----- src/d/actor/d_a_obj_dragonhead.cpp | 18 ++--- src/d/actor/d_a_obj_hfuck1.cpp | 18 ++--- src/d/actor/d_a_obj_movebox.cpp | 18 ++--- src/d/actor/d_a_obj_mtest.cpp | 18 ++--- src/d/actor/d_a_obj_paper.cpp | 18 ++--- src/d/actor/d_a_obj_toripost.cpp | 18 ++--- src/d/actor/d_a_obj_zouK.cpp | 18 ++--- src/d/actor/d_a_player_main.cpp | 108 ++++++++++++++--------------- src/d/actor/d_a_race_item.cpp | 18 ++--- src/d/actor/d_a_rd.cpp | 18 ++--- src/d/actor/d_a_swattack.cpp | 18 ++--- src/d/actor/d_a_swhit0.cpp | 36 +++++----- src/d/actor/d_a_switem.cpp | 18 ++--- src/d/actor/d_a_tag_ret.cpp | 18 ++--- src/d/d_npc.cpp | 18 ++--- 30 files changed, 450 insertions(+), 450 deletions(-) diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index 53251e78f..9d37f9053 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -76,23 +76,23 @@ dCcD_SrcCyl cc_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_SKULL_HAMMER, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0x0F, - /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ 0x03, - /* SrcObjCo SPrm */ 0x75, + /* SrcObjAt Type */ AT_TYPE_SKULL_HAMMER, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0x0F, + /* SrcObjTg Type */ AT_TYPE_ALL, + /* SrcObjTg SPrm */ 0x03, + /* SrcObjCo SPrm */ 0x75, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0x05, /* SrcGObjTg HitMark */ 0x0C, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x03, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x03, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { @@ -406,23 +406,23 @@ dCcD_SrcSph fire_at_sph_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_FIRE, - /* SrcObjAt Atp */ 0x02, - /* SrcObjAt SPrm */ 0x0F, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ AT_TYPE_FIRE, + /* SrcObjAt Atp */ 0x02, + /* SrcObjAt SPrm */ 0x0F, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0x01, + /* SrcGObjAt SPrm */ 0x01, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS { diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index e009c3e99..cde9e9ce9 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/src/d/actor/d_a_agbsw0.cpp @@ -31,23 +31,23 @@ static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_BOMB, - /* SrcObjTg SPrm */ 0x09, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_BOMB, + /* SrcObjTg SPrm */ 0x09, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x04, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x04, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 418675861..61f39edc0 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -1256,23 +1256,23 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_UNK1000, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_NORMAL_ARROW | AT_TYPE_FIRE_ARROW | AT_TYPE_ICE_ARROW | AT_TYPE_LIGHT_ARROW | AT_TYPE_GRAPPLING_HOOK, - /* SrcObjTg SPrm */ 0x03, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ AT_TYPE_UNK1000, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_NORMAL_ARROW | AT_TYPE_FIRE_ARROW | AT_TYPE_ICE_ARROW | AT_TYPE_LIGHT_ARROW | AT_TYPE_GRAPPLING_HOOK, + /* SrcObjTg SPrm */ 0x03, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x06, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x06, + /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS { @@ -1287,23 +1287,23 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_UNK1000, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0x145, + /* SrcObjAt Type */ AT_TYPE_UNK1000, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0x145, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x02, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x02, + /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS { @@ -1318,23 +1318,23 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_UNK1000, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ 0x03, - /* SrcObjCo SPrm */ 0x75, + /* SrcObjAt Type */ AT_TYPE_UNK1000, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), + /* SrcObjTg SPrm */ 0x03, + /* SrcObjCo SPrm */ 0x75, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0x0C, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x03, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x03, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { @@ -1350,23 +1350,23 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_UNK1000, - /* SrcObjAt Atp */ 2, - /* SrcObjAt SPrm */ 0x0F, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0x75, + /* SrcObjAt Type */ AT_TYPE_UNK1000, + /* SrcObjAt Atp */ 2, + /* SrcObjAt SPrm */ 0x0F, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0x75, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0x06, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0x0C, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x03, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x03, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index e4a69cb91..5652a68ef 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -1365,23 +1365,23 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_UNK1000, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_NORMAL_ARROW | AT_TYPE_FIRE_ARROW | AT_TYPE_ICE_ARROW | AT_TYPE_LIGHT_ARROW | AT_TYPE_GRAPPLING_HOOK, - /* SrcObjTg SPrm */ 0x03, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ AT_TYPE_UNK1000, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_NORMAL_ARROW | AT_TYPE_FIRE_ARROW | AT_TYPE_ICE_ARROW | AT_TYPE_LIGHT_ARROW | AT_TYPE_GRAPPLING_HOOK, + /* SrcObjTg SPrm */ 0x03, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x06, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x06, + /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS { @@ -1397,23 +1397,23 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_UNK1000, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ 0x03, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ AT_TYPE_UNK1000, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), + /* SrcObjTg SPrm */ 0x03, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x06, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x06, + /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS { @@ -1429,23 +1429,23 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_UNK1000, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ 0x03, - /* SrcObjCo SPrm */ 0x75, + /* SrcObjAt Type */ AT_TYPE_UNK1000, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), + /* SrcObjTg SPrm */ 0x03, + /* SrcObjCo SPrm */ 0x75, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0x0C, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x03, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x03, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { @@ -1461,23 +1461,23 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_UNK1000, - /* SrcObjAt Atp */ 1, - /* SrcObjAt SPrm */ 0x05, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0x61, + /* SrcObjAt Type */ AT_TYPE_UNK1000, + /* SrcObjAt Atp */ 1, + /* SrcObjAt SPrm */ 0x05, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0x61, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0x06, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0x0C, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x03, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x03, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 79aedc098..f641a03e1 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -27,23 +27,23 @@ const dCcD_SrcCps daArrow_c::m_at_cps_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_NORMAL_ARROW, - /* SrcObjAt Atp */ 2, - /* SrcObjAt SPrm */ 0xB, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ AT_TYPE_NORMAL_ARROW, + /* SrcObjAt Atp */ 2, + /* SrcObjAt SPrm */ 0xB, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 7, /* SrcGObjAt HitMark */ 0xD, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCpsS { @@ -57,23 +57,23 @@ const dCcD_SrcSph daArrow_c::m_co_sph_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0x119, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0x119, /* SrcGObjAt Se */ 7, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x04, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x04, + /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS { diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index b26d29a6c..86d944c2f 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -304,23 +304,23 @@ namespace daBomb2 { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_BOMB, - /* SrcObjAt Atp */ 0x04, - /* SrcObjAt SPrm */ 0x0E, - /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ 0x09, - /* SrcObjCo SPrm */ 0x79, + /* SrcObjAt Type */ AT_TYPE_BOMB, + /* SrcObjAt Atp */ 0x04, + /* SrcObjAt SPrm */ 0x0E, + /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), + /* SrcObjTg SPrm */ 0x09, + /* SrcObjCo SPrm */ 0x79, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0x01, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x02, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x02, + /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS { diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index dafd98072..3ee5962ea 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -27,23 +27,23 @@ static dCcD_SrcCps l_cps_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_LEAF_WIND, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0x0F, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ AT_TYPE_LEAF_WIND, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0x0F, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0x02, + /* SrcGObjAt SPrm */ 0x02, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x04, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x04, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCpsS { diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index 141a795a3..a65156d0d 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -275,23 +275,23 @@ static dCcD_SrcCps l_at_cps_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_HOOKSHOT, - /* SrcObjAt Atp */ 0x01, - /* SrcObjAt SPrm */ 0x0B, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ AT_TYPE_HOOKSHOT, + /* SrcObjAt Atp */ 0x01, + /* SrcObjAt SPrm */ 0x0B, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0x08, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCpsS { diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index 9dd65cd35..0903192ed 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -327,23 +327,23 @@ dCcD_SrcCyl daIball_c::m_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ 0x09, - /* SrcObjCo SPrm */ 0x79, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ ~(AT_TYPE_LIGHT), + /* SrcObjTg SPrm */ 0x09, + /* SrcObjCo SPrm */ 0x79, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0x04, + /* SrcGObjAt SPrm */ 0x04, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x04, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x04, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index 26456557a..4bb76408c 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -1474,23 +1474,23 @@ dCcD_SrcCyl daItem_c::m_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ 0x09, - /* SrcObjCo SPrm */ 0x59, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_ALL, + /* SrcObjTg SPrm */ 0x09, + /* SrcObjCo SPrm */ 0x59, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x04, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x04, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp index d12933daa..7d6c135d8 100644 --- a/src/d/actor/d_a_lamp.cpp +++ b/src/d/actor/d_a_lamp.cpp @@ -13,23 +13,23 @@ static dCcD_SrcSph sph_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0x0, - /* SrcObjTg Type */ AT_TYPE_FIRE | AT_TYPE_UNK20000 | AT_TYPE_FIRE_ARROW | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000, - /* SrcObjTg SPrm */ 0x9, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0x0, + /* SrcObjTg Type */ AT_TYPE_FIRE | AT_TYPE_UNK20000 | AT_TYPE_FIRE_ARROW | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000, + /* SrcObjTg SPrm */ 0x9, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x00, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x00, + /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS { diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index 5021f2e3d..140e985c0 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/src/d/actor/d_a_nh.cpp @@ -22,23 +22,23 @@ static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ 0x03, - /* SrcObjCo SPrm */ 0x19, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_ALL, + /* SrcObjTg SPrm */ 0x03, + /* SrcObjCo SPrm */ 0x19, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x04, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x04, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index b509ef01c..b7b58ad92 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -311,23 +311,23 @@ static dCcD_SrcSph l_sph_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_SWORD, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0x09, - /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0x79, + /* SrcObjAt Type */ AT_TYPE_SWORD, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0x09, + /* SrcObjTg Type */ AT_TYPE_ALL, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0x79, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS { @@ -340,23 +340,23 @@ static dCcD_SrcSph l_tg_sph_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ 0x05, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_ALL, + /* SrcObjTg SPrm */ 0x05, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS { @@ -369,23 +369,23 @@ static dCcD_SrcCps l_kam_at_cps_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_SWORD, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0x09, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ AT_TYPE_SWORD, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0x09, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0x02, + /* SrcGObjAt SPrm */ 0x02, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCpsS { diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index b8977a753..6b96008be 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -50,23 +50,23 @@ static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG | AT_TYPE_LEAF_WIND | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ 0x05, - /* SrcObjCo SPrm */ 0x75, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG | AT_TYPE_LEAF_WIND | AT_TYPE_LIGHT), + /* SrcObjTg SPrm */ 0x05, + /* SrcObjCo SPrm */ 0x75, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x04, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x04, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { @@ -80,23 +80,23 @@ static dCcD_SrcCyl l_light_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_LIGHT, - /* SrcObjTg SPrm */ 0x03, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_LIGHT, + /* SrcObjTg SPrm */ 0x03, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x04, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x04, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { @@ -110,23 +110,23 @@ static dCcD_SrcCps l_fan_light_cps_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_LIGHT, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0x0F, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ AT_TYPE_LIGHT, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0x0F, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0x02, + /* SrcGObjAt SPrm */ 0x02, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCpsS { @@ -140,23 +140,23 @@ static dCcD_SrcCyl l_wind_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_LEAF_WIND, - /* SrcObjTg SPrm */ 0x03, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_LEAF_WIND, + /* SrcObjTg SPrm */ 0x03, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x04, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x04, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 1405ee5c3..aa394ac43 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -20,23 +20,23 @@ static const dCcD_SrcCyl l_cyl_at_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_UNK800, - /* SrcObjAt Atp */ 1, - /* SrcObjAt SPrm */ 5, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ AT_TYPE_UNK800, + /* SrcObjAt Atp */ 1, + /* SrcObjAt SPrm */ 5, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 9, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 3, + /* SrcGObjAt SPrm */ 3, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { @@ -50,23 +50,23 @@ static const dCcD_SrcCyl l_cyl_tg_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ 9, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), + /* SrcObjTg SPrm */ 9, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 6, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 6, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp index c670c59b2..7a882b4b7 100644 --- a/src/d/actor/d_a_obj_dragonhead.cpp +++ b/src/d/actor/d_a_obj_dragonhead.cpp @@ -17,23 +17,23 @@ static dCcD_SrcSph sph_check_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_FIRE_ARROW, - /* SrcObjTg SPrm */ 0x09, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_FIRE_ARROW, + /* SrcObjTg SPrm */ 0x09, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS { diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp index a11c49b43..19809f851 100644 --- a/src/d/actor/d_a_obj_hfuck1.cpp +++ b/src/d/actor/d_a_obj_hfuck1.cpp @@ -20,23 +20,23 @@ namespace { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_HOOKSHOT, - /* SrcObjTg SPrm */ 9, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_HOOKSHOT, + /* SrcObjTg SPrm */ 9, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 6, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 6, + /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS { diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 076039d75..562799afa 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -385,23 +385,23 @@ namespace daObjMovebox { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_BOMB, - /* SrcObjTg SPrm */ 0x09, - /* SrcObjCo SPrm */ 0x79, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_BOMB, + /* SrcObjTg SPrm */ 0x09, + /* SrcObjCo SPrm */ 0x79, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp index ecda55abf..07aa96340 100644 --- a/src/d/actor/d_a_obj_mtest.cpp +++ b/src/d/actor/d_a_obj_mtest.cpp @@ -73,23 +73,23 @@ const dCcD_SrcCyl daObjMtest::Act_c::M_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_BOMB, - /* SrcObjTg SPrm */ 0x09, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_BOMB, + /* SrcObjTg SPrm */ 0x09, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp index faf418ace..0bd6e98e1 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -57,23 +57,23 @@ namespace daObjPaper { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ 0x0F, - /* SrcObjCo SPrm */ 0x79, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), + /* SrcObjTg SPrm */ 0x0F, + /* SrcObjCo SPrm */ 0x79, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x03, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x03, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index 517979a19..5b952ff7e 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -39,23 +39,23 @@ const dCcD_SrcCyl daObjTpost_c::m_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG), - /* SrcObjTg SPrm */ 0x0F, - /* SrcObjCo SPrm */ 0x79, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG), + /* SrcObjTg SPrm */ 0x0F, + /* SrcObjCo SPrm */ 0x79, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x07, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x07, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index 6afd35946..ea6c9063a 100644 --- a/src/d/actor/d_a_obj_zouK.cpp +++ b/src/d/actor/d_a_obj_zouK.cpp @@ -29,23 +29,23 @@ namespace daObjZouk { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_ALL & ~(AT_TYPE_LIGHT | AT_TYPE_UNK400000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER), - /* SrcObjTg SPrm */ 0x0F, - /* SrcObjCo SPrm */ 0x79, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_ALL & ~(AT_TYPE_LIGHT | AT_TYPE_UNK400000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER), + /* SrcObjTg SPrm */ 0x0F, + /* SrcObjCo SPrm */ 0x79, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x03, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x03, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index ed90be616..375076544 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -1856,23 +1856,23 @@ static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ 0x05, - /* SrcObjCo SPrm */ 0x73, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), + /* SrcObjTg SPrm */ 0x05, + /* SrcObjCo SPrm */ 0x73, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0x25, /* SrcGObjTg HitMark */ 0x0C, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { @@ -1886,23 +1886,23 @@ static dCcD_SrcCyl l_wind_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_LEAF_WIND, - /* SrcObjTg SPrm */ 0x05, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_LEAF_WIND, + /* SrcObjTg SPrm */ 0x05, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0x02, + /* SrcGObjAt SPrm */ 0x02, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { @@ -1916,23 +1916,23 @@ static dCcD_SrcCyl l_at_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_SWORD, - /* SrcObjAt Atp */ 0x02, - /* SrcObjAt SPrm */ 0x0B, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ AT_TYPE_SWORD, + /* SrcObjAt Atp */ 0x02, + /* SrcObjAt SPrm */ 0x0B, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0x0F, /* SrcGObjAt Spl */ 0x01, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { @@ -1946,23 +1946,23 @@ static dCcD_SrcCps l_at_cps_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_SWORD, - /* SrcObjAt Atp */ 0x01, - /* SrcObjAt SPrm */ 0x0B, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ AT_TYPE_SWORD, + /* SrcObjAt Atp */ 0x01, + /* SrcObjAt SPrm */ 0x0B, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0x01, /* SrcGObjAt HitMark */ 0x0D, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCpsS { @@ -1976,23 +1976,23 @@ static dCcD_SrcCps l_fan_wind_cps_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_LEAF_WIND, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0x0B, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ AT_TYPE_LEAF_WIND, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0x0B, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0x02, + /* SrcGObjAt SPrm */ 0x02, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCpsS { @@ -2006,23 +2006,23 @@ static dCcD_SrcSph l_fan_wind_sph_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ AT_TYPE_LEAF_WIND, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0x0B, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ AT_TYPE_LEAF_WIND, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0x0B, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS { diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp index 1d12c76e9..d2678b7a0 100644 --- a/src/d/actor/d_a_race_item.cpp +++ b/src/d/actor/d_a_race_item.cpp @@ -15,23 +15,23 @@ static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ 0x03, - /* SrcObjCo SPrm */ 0x19, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_ALL, + /* SrcObjTg SPrm */ 0x03, + /* SrcObjCo SPrm */ 0x19, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x04, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x04, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index 9a7e530f2..354294698 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -34,23 +34,23 @@ const dCcD_SrcCyl daRd_c::m_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000), - /* SrcObjTg SPrm */ 0x09, - /* SrcObjCo SPrm */ 0x7F, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000), + /* SrcObjTg SPrm */ 0x09, + /* SrcObjCo SPrm */ 0x7F, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0x23, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x06, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x06, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_swattack.cpp b/src/d/actor/d_a_swattack.cpp index 06f98697a..3273f6f22 100644 --- a/src/d/actor/d_a_swattack.cpp +++ b/src/d/actor/d_a_swattack.cpp @@ -14,23 +14,23 @@ static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ 0x09, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_ALL, + /* SrcObjTg SPrm */ 0x09, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 0b25d317c..15426ae59 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -14,23 +14,23 @@ static dCcD_SrcSph l_sph_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_LIGHT | AT_TYPE_UNK400000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER), // 0xFF1DFEFF - /* SrcObjTg SPrm */ 9, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ ~(AT_TYPE_LIGHT | AT_TYPE_UNK400000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER), // 0xFF1DFEFF + /* SrcObjTg SPrm */ 9, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS { @@ -43,23 +43,23 @@ static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0x75, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0x75, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x00, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x00, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp index eeb559e5b..911ecf9be 100644 --- a/src/d/actor/d_a_switem.cpp +++ b/src/d/actor/d_a_switem.cpp @@ -16,23 +16,23 @@ static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ 0x09, - /* SrcObjCo SPrm */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_ALL, + /* SrcObjTg SPrm */ 0x09, + /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x04, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x04, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp index 25b4b2166..a0b968cda 100644 --- a/src/d/actor/d_a_tag_ret.cpp +++ b/src/d/actor/d_a_tag_ret.cpp @@ -16,23 +16,23 @@ static dCcD_SrcCyl cyl_check_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ 0x119, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ 0, + /* SrcObjTg SPrm */ 0, + /* SrcObjCo SPrm */ 0x119, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS { diff --git a/src/d/d_npc.cpp b/src/d/d_npc.cpp index 1878fb69c..8f672f76d 100644 --- a/src/d/d_npc.cpp +++ b/src/d/d_npc.cpp @@ -928,23 +928,23 @@ dCcD_SrcCyl dNpc_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, - /* SrcObjAt Type */ 0, - /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ 0, - /* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG), - /* SrcObjTg SPrm */ 0x03, - /* SrcObjCo SPrm */ 0x75, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG), + /* SrcObjTg SPrm */ 0x03, + /* SrcObjCo SPrm */ 0x75, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt GFlag */ 0, + /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg GFlag */ 0x04, - /* SrcGObjCo GFlag */ 0, + /* SrcGObjTg SPrm */ 0x04, + /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS {