From e77f841d351a2623490acdf0913eaf8f97f844d2 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Mon, 29 Dec 2025 14:12:01 +0200 Subject: [PATCH] Work on d_cc_d debug (#3002) --- include/SSystem/SComponent/c_cc_d.h | 36 ++++++---- include/SSystem/SComponent/c_m3d.h | 7 ++ include/SSystem/SComponent/c_m3d_g_lin.h | 3 +- include/d/d_cc_d.h | 19 ++++- include/m_Do/m_Do_mtx.h | 4 ++ src/SSystem/SComponent/c_m3d.cpp | 41 +++++++++++ src/d/actor/d_a_alink.cpp | 20 +++--- src/d/actor/d_a_b_dr.cpp | 30 ++++---- src/d/actor/d_a_b_ds.cpp | 20 +++--- src/d/actor/d_a_b_gg.cpp | 20 +++--- src/d/actor/d_a_b_gnd.cpp | 10 +-- src/d/actor/d_a_b_gos.cpp | 14 ++-- src/d/actor/d_a_b_yo.cpp | 10 +-- src/d/actor/d_a_b_yo_ice.cpp | 30 ++++---- src/d/actor/d_a_b_zant.cpp | 14 ++-- src/d/actor/d_a_b_zant_mobile.cpp | 10 +-- src/d/actor/d_a_bg_obj.cpp | 10 +-- src/d/actor/d_a_boomerang.cpp | 8 ++- src/d/actor/d_a_canoe.cpp | 10 +-- src/d/actor/d_a_cstaF.cpp | 10 +-- src/d/actor/d_a_cstatue.cpp | 6 +- src/d/actor/d_a_e_ai.cpp | 10 +-- src/d/actor/d_a_e_bee.cpp | 10 +-- src/d/actor/d_a_e_bi.cpp | 10 +-- src/d/actor/d_a_e_df.cpp | 14 ++-- src/d/actor/d_a_e_fs.cpp | 10 +-- src/d/actor/d_a_e_gb.cpp | 10 +-- src/d/actor/d_a_e_hp.cpp | 16 +++-- src/d/actor/d_a_e_is.cpp | 10 +-- src/d/actor/d_a_e_kk.cpp | 10 +-- src/d/actor/d_a_e_md.cpp | 10 +-- src/d/actor/d_a_e_nest.cpp | 10 +-- src/d/actor/d_a_e_pm.cpp | 10 +-- src/d/actor/d_a_e_po.cpp | 10 +-- src/d/actor/d_a_e_pz.cpp | 20 +++--- src/d/actor/d_a_e_rdb.cpp | 10 +-- src/d/actor/d_a_e_sb.cpp | 10 +-- src/d/actor/d_a_e_st.cpp | 10 +-- src/d/actor/d_a_e_vt.cpp | 10 +-- src/d/actor/d_a_e_zh.cpp | 8 ++- src/d/actor/d_a_e_zm.cpp | 6 +- src/d/actor/d_a_e_zs.cpp | 10 +-- src/d/actor/d_a_ep.cpp | 10 +-- src/d/actor/d_a_horse.cpp | 10 +-- src/d/actor/d_a_mg_fish.cpp | 10 +-- src/d/actor/d_a_npc.cpp | 10 +-- src/d/actor/d_a_npc2.cpp | 2 + src/d/actor/d_a_npc4.cpp | 10 +-- src/d/actor/d_a_npc_blue_ns.cpp | 10 +-- src/d/actor/d_a_npc_cd.cpp | 14 ++-- src/d/actor/d_a_npc_cd2.cpp | 10 +-- src/d/actor/d_a_npc_coach.cpp | 4 +- src/d/actor/d_a_npc_kn.cpp | 4 +- src/d/actor/d_a_npc_ks.cpp | 10 +-- src/d/actor/d_a_npc_shop0.cpp | 10 +-- src/d/actor/d_a_obj_Turara.cpp | 10 +-- src/d/actor/d_a_obj_TvCdlst.cpp | 10 +-- src/d/actor/d_a_obj_Y_taihou.cpp | 10 +-- src/d/actor/d_a_obj_automata.cpp | 10 +-- src/d/actor/d_a_obj_barDesk.cpp | 4 +- src/d/actor/d_a_obj_bbox.cpp | 10 +-- src/d/actor/d_a_obj_bemos.cpp | 10 +-- src/d/actor/d_a_obj_bhashi.cpp | 10 +-- src/d/actor/d_a_obj_bky_rock.cpp | 10 +-- src/d/actor/d_a_obj_bmWindow.cpp | 10 +-- src/d/actor/d_a_obj_boumato.cpp | 10 +-- src/d/actor/d_a_obj_brg.cpp | 20 +++--- src/d/actor/d_a_obj_bubblePilar.cpp | 4 +- src/d/actor/d_a_obj_burnbox.cpp | 10 +-- src/d/actor/d_a_obj_carry.cpp | 20 +++--- src/d/actor/d_a_obj_cblock.cpp | 2 + src/d/actor/d_a_obj_chest.cpp | 10 +-- src/d/actor/d_a_obj_crvlh_down.cpp | 10 +-- src/d/actor/d_a_obj_cwall.cpp | 20 +++--- src/d/actor/d_a_obj_fireWood.cpp | 10 +-- src/d/actor/d_a_obj_fireWood2.cpp | 10 +-- src/d/actor/d_a_obj_flag2.cpp | 10 +-- src/d/actor/d_a_obj_gadget.cpp | 10 +-- src/d/actor/d_a_obj_gpTaru.cpp | 10 +-- src/d/actor/d_a_obj_graWall.cpp | 10 +-- src/d/actor/d_a_obj_gra_rock.cpp | 10 +-- src/d/actor/d_a_obj_grave_stone.cpp | 4 +- src/d/actor/d_a_obj_hakai_brl.cpp | 10 +-- src/d/actor/d_a_obj_hakai_ftr.cpp | 14 ++-- src/d/actor/d_a_obj_hbombkoya.cpp | 10 +-- src/d/actor/d_a_obj_hhashi.cpp | 10 +-- src/d/actor/d_a_obj_iceblock.cpp | 10 +-- src/d/actor/d_a_obj_iceleaf.cpp | 10 +-- src/d/actor/d_a_obj_inobone.cpp | 20 +++--- src/d/actor/d_a_obj_item.cpp | 10 +-- src/d/actor/d_a_obj_kago.cpp | 10 +-- src/d/actor/d_a_obj_kaisou.cpp | 10 +-- src/d/actor/d_a_obj_kantera.cpp | 10 +-- src/d/actor/d_a_obj_kazeneko.cpp | 10 +-- src/d/actor/d_a_obj_kbacket.cpp | 10 +-- src/d/actor/d_a_obj_kgate.cpp | 10 +-- src/d/actor/d_a_obj_klift00.cpp | 10 +-- src/d/actor/d_a_obj_ktOnFire.cpp | 10 +-- src/d/actor/d_a_obj_laundry.cpp | 10 +-- src/d/actor/d_a_obj_life_container.cpp | 10 +-- src/d/actor/d_a_obj_lv1Candle00.cpp | 4 +- src/d/actor/d_a_obj_lv1Candle01.cpp | 4 +- src/d/actor/d_a_obj_lv2Candle.cpp | 4 +- src/d/actor/d_a_obj_lv5FloorBoard.cpp | 10 +-- src/d/actor/d_a_obj_lv5IceWall.cpp | 10 +-- src/d/actor/d_a_obj_lv5SwIce.cpp | 10 +-- src/d/actor/d_a_obj_lv5ychndlr.cpp | 20 +++--- src/d/actor/d_a_obj_lv5yiblltray.cpp | 10 +-- src/d/actor/d_a_obj_lv6ChangeGate.cpp | 4 +- src/d/actor/d_a_obj_lv6SwGate.cpp | 11 ++- src/d/actor/d_a_obj_lv6TogeTrap.cpp | 10 +-- src/d/actor/d_a_obj_lv6bemos2.cpp | 10 +-- src/d/actor/d_a_obj_lv6egate.cpp | 10 +-- src/d/actor/d_a_obj_lv7bridge.cpp | 10 +-- src/d/actor/d_a_obj_master_sword.cpp | 10 +-- src/d/actor/d_a_obj_mato.cpp | 10 +-- src/d/actor/d_a_obj_mie.cpp | 10 +-- src/d/actor/d_a_obj_movebox.cpp | 10 +-- src/d/actor/d_a_obj_nagaisu.cpp | 10 +-- src/d/actor/d_a_obj_octhashi.cpp | 12 ++-- src/d/actor/d_a_obj_oiltubo.cpp | 10 +-- src/d/actor/d_a_obj_onsenTaru.cpp | 10 +-- src/d/actor/d_a_obj_pdtile.cpp | 10 +-- src/d/actor/d_a_obj_picture.cpp | 10 +-- src/d/actor/d_a_obj_pillar.cpp | 10 +-- src/d/actor/d_a_obj_pumpkin.cpp | 10 +-- src/d/actor/d_a_obj_rgate.cpp | 10 +-- src/d/actor/d_a_obj_riverrock.cpp | 10 +-- src/d/actor/d_a_obj_rotTrap.cpp | 4 +- src/d/actor/d_a_obj_rw.cpp | 10 +-- src/d/actor/d_a_obj_shield.cpp | 10 +-- src/d/actor/d_a_obj_smallkey.cpp | 10 +-- src/d/actor/d_a_obj_so.cpp | 10 +-- src/d/actor/d_a_obj_swLight.cpp | 10 +-- src/d/actor/d_a_obj_swpropeller.cpp | 8 ++- src/d/actor/d_a_obj_taFence.cpp | 10 +-- src/d/actor/d_a_obj_tatigi.cpp | 10 +-- src/d/actor/d_a_obj_thashi.cpp | 10 +-- src/d/actor/d_a_obj_thdoor.cpp | 10 +-- src/d/actor/d_a_obj_togeTrap.cpp | 10 +-- src/d/actor/d_a_obj_tp.cpp | 10 +-- src/d/actor/d_a_obj_volcbom.cpp | 10 +-- src/d/actor/d_a_obj_waterfall.cpp | 10 +-- src/d/actor/d_a_obj_web1.cpp | 10 +-- src/d/actor/d_a_obj_window.cpp | 10 +-- src/d/actor/d_a_obj_wood_statue.cpp | 10 +-- src/d/actor/d_a_obj_wsword.cpp | 10 +-- src/d/actor/d_a_obj_yel_bag.cpp | 4 +- src/d/actor/d_a_obj_yobikusa.cpp | 10 +-- src/d/actor/d_a_obj_zdoor.cpp | 20 +++--- src/d/actor/d_a_obj_zrTurara.cpp | 4 +- src/d/actor/d_a_obj_zraMark.cpp | 10 +-- src/d/actor/d_a_spinner.cpp | 8 ++- src/d/actor/d_a_tag_attack_item.cpp | 10 +-- src/d/actor/d_a_tag_csw.cpp | 20 +++--- src/d/actor/d_a_tag_pachi.cpp | 10 +-- src/d/actor/d_a_tag_qs.cpp | 10 +-- src/d/actor/d_a_tag_sppath.cpp | 10 +-- src/d/actor/d_a_tag_yami.cpp | 10 +-- src/d/actor/d_a_tbox.cpp | 10 +-- src/d/actor/d_a_tbox2.cpp | 10 +-- src/d/d_cc_d.cpp | 89 +++++++++++++++++++++--- 162 files changed, 1162 insertions(+), 662 deletions(-) diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 0ad2f717a7..413664746b 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -78,6 +78,10 @@ struct cCcD_SrcSphAttr { cM3dGSphS mSph; }; +struct cCcD_SrcCylAttr { + cM3dGCylS mCyl; +}; + class cCcD_DivideInfo { private: /* 0x00 */ u32 mXDivInfo; @@ -214,7 +218,7 @@ public: cCcD_Obj* GetHitObj() { return mHitObj; } const cCcD_Obj* GetHitObj() const { return mHitObj; } u32 MskSPrm(u32 mask) const { return mSPrm & mask; } - u32 MskRPrm(u32 mask) { return mRPrm & mask; } + u32 MskRPrm(u32 mask) const { return mRPrm & mask; } void OnSPrmBit(u32 flag) { mSPrm |= flag; } void OffSPrmBit(u32 flag) { mSPrm &= ~flag; } u32 ChkSPrm(u32 prm) const { return MskSPrm(prm); } @@ -228,7 +232,8 @@ STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCommonBase)); #pragma pack(1) class cCcD_ObjAt : public cCcD_ObjCommonBase { public: - cCcD_ObjAt() { mType = 0; } + cCcD_ObjAt() { Ct(); } + void Ct() { mType = 0; } virtual ~cCcD_ObjAt() {} void SetHit(cCcD_Obj*); void Set(cCcD_SrcObjAt const&); @@ -241,7 +246,7 @@ public: void SetType(u32 type) { mType = type; } void SetAtp(int atp) { mAtp = atp; } void ClrSet() { OffSPrmBit(1); } - u32 ChkHit() { return MskRPrm(1); } + u32 ChkHit() const { return MskRPrm(1); } protected: /* 0x10 */ int mType; @@ -266,7 +271,7 @@ public: u32 GetGrp() const { return MskSPrm(0x1E); } bool ChkSet() const { return MskSPrm(1); } void ClrSet() { OffSPrmBit(1); } - u32 ChkHit() { return MskRPrm(1); } + u32 ChkHit() const { return MskRPrm(1); } private: /* 0x10 */ int mType; @@ -276,6 +281,8 @@ STATIC_ASSERT(0x14 == sizeof(cCcD_ObjTg)); class cCcD_ObjCo : public cCcD_ObjCommonBase { public: + cCcD_ObjCo() { Ct(); } + void Ct() {} virtual ~cCcD_ObjCo() {} void SetHit(cCcD_Obj*); void ClrHit(); @@ -292,7 +299,7 @@ public: void OnCoSameActorHit() { OnSPrmBit(cCcD_ObjCommonBase::CO_SPRM_SAME_ACTOR_HIT); } void OffCoSameActorHit() { OffSPrmBit(cCcD_ObjCommonBase::CO_SPRM_SAME_ACTOR_HIT); } void ClrSet() { OffSPrmBit(1); } - u32 ChkHit() { return MskRPrm(1); } + u32 ChkHit() const { return MskRPrm(1); } void Set(cCcD_SrcObjCo const& src) { cCcD_ObjCommonBase::Set(src.mBase); } }; @@ -368,12 +375,12 @@ public: void ClrAtHit() { mObjAt.ClrHit(); } void ClrTgHit() { mObjTg.ClrHit(); } void ClrCoHit() { mObjCo.ClrHit(); } - u32 ChkAtHit() { return mObjAt.ChkHit(); } - u32 ChkTgHit() { return mObjTg.ChkHit(); } - u32 ChkCoHit() { return mObjCo.ChkHit(); } - cCcD_Obj* GetAtHitObj() { return mObjAt.GetHitObj(); } - cCcD_Obj* GetTgHitObj() { return mObjTg.GetHitObj(); } - cCcD_Obj* GetCoHitObj() { return mObjCo.GetHitObj(); } + u32 ChkAtHit() const { return mObjAt.ChkHit(); } + u32 ChkTgHit() const { return mObjTg.ChkHit(); } + u32 ChkCoHit() const { return mObjCo.ChkHit(); } + cCcD_Obj* GetAtHitObj() const { return (cCcD_Obj*)mObjAt.GetHitObj(); } + cCcD_Obj* GetTgHitObj() const { return (cCcD_Obj*)mObjTg.GetHitObj(); } + cCcD_Obj* GetCoHitObj() const { return (cCcD_Obj*)mObjCo.GetHitObj(); } u32 ChkAtSPrm(u32 prm) { return mObjAt.ChkSPrm(prm); } u32 ChkCoSPrm(u32 prm) const { return mObjCo.ChkSPrm(prm); } void OnTgNoSlingHitInfSet() { mObjTg.OnSPrmBit(0x40); } @@ -463,9 +470,9 @@ class cCcD_GObjInf : public cCcD_Obj { public: cCcD_GObjInf() {} virtual ~cCcD_GObjInf() {} - virtual void ClrAtHit() { mObjAt.ClrHit(); } - virtual void ClrTgHit() { mObjTg.ClrHit(); } - virtual void ClrCoHit() { mObjCo.ClrHit(); } + virtual void ClrAtHit() { cCcD_ObjHitInf::ClrAtHit(); } + virtual void ClrTgHit() { cCcD_ObjHitInf::ClrTgHit(); } + virtual void ClrCoHit() { cCcD_ObjHitInf::ClrCoHit(); } virtual cCcD_GObjInf const* GetGObjInf() const { return this; } virtual cCcD_GObjInf* GetGObjInf() { return this; } }; @@ -582,6 +589,7 @@ public: virtual void CalcAabBox(); virtual bool GetNVec(cXyz const&, cXyz*) const; virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const; + void Set(const cCcD_SrcCylAttr& src) { cM3dGCyl::Set(src.mCyl); } const cM3dGCyl* GetShapeP() const { return this; } diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index 4c4d947100..6634100209 100644 --- a/include/SSystem/SComponent/c_m3d.h +++ b/include/SSystem/SComponent/c_m3d.h @@ -108,4 +108,11 @@ inline bool cM3d_Cross_CylSph(const cM3dGCyl* cyl, const cM3dGSph* sph, Vec* out return cM3d_Cross_CylSph(cyl, sph, out, &sp10); } +#ifdef DEBUG + +bool cM3d_UpMtx_Base(const Vec& param_1, const Vec& param_2, Mtx param_3); +bool cM3d_UpMtx(const Vec& param_1, Mtx param_2); + +#endif + #endif diff --git a/include/SSystem/SComponent/c_m3d_g_lin.h b/include/SSystem/SComponent/c_m3d_g_lin.h index 85bfc28437..d6b86ebcf0 100644 --- a/include/SSystem/SComponent/c_m3d_g_lin.h +++ b/include/SSystem/SComponent/c_m3d_g_lin.h @@ -18,7 +18,7 @@ public: void SetStartEnd(const cXyz&, const cXyz&); void SetStartEnd(const Vec&, const Vec&); void CalcPos(Vec*, f32) const; - void CalcVec(Vec* pOut) const { VECSubtract(&this->mEnd, &this->mStart, pOut); } + void CalcVec(Vec* pOut) const { PSVECSubtract(&this->mEnd, &this->mStart, pOut); } void SetEnd(const cXyz&); void set(const Vec& i_start, const Vec& i_end) { SetStartEnd(i_start, i_end); } @@ -31,6 +31,7 @@ public: cXyz& GetEndP(void) { return mEnd; } cXyz& GetEnd() { return mEnd; } const cXyz& GetEnd() const { return mEnd; } + f32 GetLen() const { return PSVECDistance(&mStart, &mEnd); } }; // Size = 0x1C STATIC_ASSERT(0x1C == sizeof(cM3dGLin)); diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h index 397a76c070..7511fda358 100644 --- a/include/d/d_cc_d.h +++ b/include/d/d_cc_d.h @@ -103,7 +103,7 @@ struct dCcD_SrcTri { struct dCcD_SrcCyl { /* 0x00 */ dCcD_SrcGObjInf mObjInf; - /* 0x30 */ cM3dGCylS mCyl; + /* 0x30 */ cCcD_SrcCylAttr mCylAttr; }; // Size: 0x44 struct dCcD_SrcCps { @@ -171,12 +171,13 @@ public: void SetMtrl(u8 mtrl) { mMtrl = mtrl; } void SetAtSpl(dCcG_At_Spl spl) { mSpl = spl; } u8 GetSe() { return mSe; } - u8 GetSpl() { return mSpl; } + dCcG_At_Spl GetSpl() { return (dCcG_At_Spl)mSpl; } u8 GetMtrl() { return mMtrl; } u8 GetHitMark() { return mHitMark; } void SetRVec(cXyz& vec) { mRVec = vec; } void SetHitPos(cXyz& pos) { mHitPos = pos; } cXyz* GetHitPosP() { return &mHitPos; } + void ClrHit() { dCcD_GAtTgCoCommonBase::ClrActorInfo(); } // private: /* 0x1C */ u8 mSe; @@ -212,6 +213,7 @@ public: void SetHitPos(cXyz& pos) { mHitPos = pos; } cXyz* GetHitPosP() { return &mHitPos; } u8 GetSe() { return mSe; } + void ClrHit() { dCcD_GAtTgCoCommonBase::ClrActorInfo(); } private: /* 0x1C */ u8 mSe; @@ -231,6 +233,7 @@ class dCcD_GObjCo : public dCcD_GAtTgCoCommonBase { public: virtual ~dCcD_GObjCo() {} void Set(dCcD_SrcGObjCo const& pSrc) { dCcD_GAtTgCoCommonBase::Set(pSrc.mBase); } + void ClrHit() { dCcD_GAtTgCoCommonBase::ClrActorInfo(); } }; // Size = 0x1C ? class dCcD_GStts : public cCcD_GStts { @@ -448,6 +451,9 @@ public: void CalcTgVec(); virtual ~dCcD_Cps() {} dCcD_Cps() {} + #if DEBUG + virtual void Draw(const GXColor& color); + #endif }; // Size = 0x144 // Triangle @@ -457,6 +463,9 @@ public: cCcD_ShapeAttr* GetShapeAttr(); virtual ~dCcD_Tri() {} dCcD_Tri() {} + #if DEBUG + virtual void Draw(const GXColor& color); + #endif }; // Cylinder @@ -469,6 +478,9 @@ public: void MoveCTg(cXyz&); virtual ~dCcD_Cyl() {} dCcD_Cyl() {} + #if DEBUG + virtual void Draw(const GXColor& color); + #endif }; // Size = 0x13C // Sphere @@ -480,6 +492,9 @@ public: void MoveCAt(cXyz&); virtual cCcD_ShapeAttr* GetShapeAttr(); virtual ~dCcD_Sph() {} + #if DEBUG + virtual void Draw(const GXColor& color); + #endif }; // Size = 0x138 dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* param_0); diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 18022e4b1a..cbc3fd8616 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -100,6 +100,10 @@ inline void cMtx_copy(const Mtx src, Mtx dst) { mDoMtx_copy(src, dst); } +inline void cMtx_trans(Mtx pDest, f32 x, f32 y, f32 z) { + mDoMtx_trans(pDest, x, y, z); +} + inline void cMtx_multVecArray(const Mtx mtx, const Vec* src, Vec* dst, u32 count) { mDoMtx_multVecArray(mtx, src, dst, count); } diff --git a/src/SSystem/SComponent/c_m3d.cpp b/src/SSystem/SComponent/c_m3d.cpp index 726ceeeedf..1af53e81e3 100644 --- a/src/SSystem/SComponent/c_m3d.cpp +++ b/src/SSystem/SComponent/c_m3d.cpp @@ -1978,6 +1978,47 @@ void cM3d_CalcVecZAngle(Vec const& param_0, csXyz* param_1) { param_1->z = 0; } +#ifdef DEBUG + +bool cM3d_UpMtx_Base(const Vec& param_1, const Vec& param_2, Mtx param_3) { + Vec local_3c; + Vec auStack_48; + f32 dVar8; + f32 angle; + + if (cM3d_IsZero(PSVECMag(¶m_2))) { + MTXIdentity(param_3); + return false; + } + + PSVECNormalize(¶m_2, &auStack_48); + PSVECCrossProduct(¶m_1, &auStack_48, &local_3c); + + if (cM3d_IsZero(PSVECMag(&local_3c))) { + local_3c.x = 1.0f; + local_3c.y = 0.0f; + local_3c.z = 0.0f; + } + + dVar8 = PSVECDotProduct(¶m_1, &auStack_48); + if (dVar8 > 1.0f) { + dVar8 = 1.0f; + } else if (dVar8 < -1.0f) { + dVar8 = -1.0f; + } + + angle = acosf(dVar8); + C_MTXRotAxisRad(param_3, &local_3c, angle); + return true; +} + +static Vec base_y = {0.0f, 1.0f, 0.0f}; + +bool cM3d_UpMtx(const Vec& param_1, Mtx param_2) { + return cM3d_UpMtx_Base(base_y, param_1, param_2); +} + +#endif void cM3d_PlaneCrossLineProcWork(f32 f1, f32 f2, f32 f3, f32 f4, f32 f5, f32 f6, f32 f7, f32* pF1, f32* pF2) { diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index c603ce2755..f0f878205f 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -1249,10 +1249,12 @@ static dCcD_SrcCyl l_cylSrc = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 35.0f, - 180.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 35.0f, + 180.0f, + }, + } }; static dCcD_SrcSph l_sphSrc = { @@ -1276,10 +1278,12 @@ static dCcD_SrcCyl l_atCylSrc = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 180.0f, - 130.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 180.0f, + 130.0f, + }, + } }; static dCcD_SrcCps l_atCpsSrc = { diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index cdf3befcb7..4bb3e1c98d 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -145,10 +145,12 @@ static dCcD_SrcCyl cc_dr_week_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 0.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcSph cc_dr_tail_src = { @@ -207,10 +209,12 @@ static dCcD_SrcCyl cc_pillar_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 0.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl cc_down_src = { @@ -221,10 +225,12 @@ static dCcD_SrcCyl cc_down_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 300.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 300.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcSph cc_downSph_src = { diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index fefbedbbd0..99795f5bee 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -132,10 +132,12 @@ static dCcD_SrcCyl cc_ds_backbone_src = { {0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 130.0f, // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 130.0f, // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl cc_ds_hand_at_cyl_src = { @@ -147,10 +149,12 @@ static dCcD_SrcCyl cc_ds_hand_at_cyl_src = { {0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 130.0f, // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 130.0f, // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcSph cc_ds_breath_at_src = { diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index 243b415ac3..8623cdb422 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -196,10 +196,12 @@ void daB_GG_c::initCc() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 130.0f, // mRadius - 200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 130.0f, // mRadius + 200.0f // mHeight + } // mCyl + } // mCylAttr }; const static dCcD_SrcCyl ccHookSrc = { @@ -210,10 +212,12 @@ void daB_GG_c::initCc() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 130.0f, // mRadius - 200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 130.0f, // mRadius + 200.0f // mHeight + } // mCyl + } // mCylAttr }; const static dCcD_SrcSph ccShieldSphSrc = { diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index dbba925577..1bc70756d5 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -4875,10 +4875,12 @@ static int daB_GND_Create(fopAc_ac_c* a_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 100.0f, // mRadius - 200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 100.0f, // mRadius + 200.0f // mHeight + } // mCyl + } }; for (int i = 0; i < 2; i++) { diff --git a/src/d/actor/d_a_b_gos.cpp b/src/d/actor/d_a_b_gos.cpp index 190baad085..a71b100158 100644 --- a/src/d/actor/d_a_b_gos.cpp +++ b/src/d/actor/d_a_b_gos.cpp @@ -389,12 +389,14 @@ static int daB_GOS_Create(fopAc_ac_c* i_this) { {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x5, 0x0, 0x0, 0x2}, // mGObjTg {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 150.0f, // mRadius - 60.0f // mHeight - } // mCyl + }, + { // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 150.0f, // mRadius + 60.0f // mHeight + } // mCyl + } }; a_this->mCcStts.Init(0xFA, 0, a_this); diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index ee926cd717..5029eec6d8 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -136,10 +136,12 @@ static dCcD_SrcCyl cc_yo_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 40.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph cc_yo_tg_src = { diff --git a/src/d/actor/d_a_b_yo_ice.cpp b/src/d/actor/d_a_b_yo_ice.cpp index c716d4a73b..085fb1e0d7 100644 --- a/src/d/actor/d_a_b_yo_ice.cpp +++ b/src/d/actor/d_a_b_yo_ice.cpp @@ -41,10 +41,12 @@ static dCcD_SrcCyl cc_yo_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 40.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl cc_yo_iron_src = { @@ -55,10 +57,12 @@ static dCcD_SrcCyl cc_yo_iron_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 40.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl cc_yo_cam_src = { @@ -69,10 +73,12 @@ static dCcD_SrcCyl cc_yo_cam_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 40.0f // mHeight + } // mCyl + } // mCylAttr }; } // namespace diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index e7e2fd146e..ea53c4d7be 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -128,12 +128,14 @@ dCcD_SrcCyl cc_zant_roll_src = { {dCcD_SE_METAL, 0x0, 0x6, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x2, 0x0, 0x0, 0x303}, // mGObjTg {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 40.0f // mHeight - } // mCyl + }, + { // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 40.0f // mHeight + } // mCyl + } }; dCcD_SrcSph cc_zant_foot_src = { diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 64d09f788e..c67b00498e 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -34,10 +34,12 @@ static dCcD_SrcCyl cc_zant_snort_src = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 40.0f, - 40.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 40.0f, + 40.0f, + }, + } }; } diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index f6491ef290..6fee7b6dde 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -265,10 +265,12 @@ static const dCcD_SrcCyl l_cyl_src = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 0.0f, - 0.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 0.0f, + 0.0f, + }, + } }; void daBgObj_c::initAtt() { diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 83cff8be3f..8853c08d03 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -1410,9 +1410,11 @@ static dCcD_SrcCyl l_windAtCylSrc = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 150.0f, - 600.0f, + { + {0.0f, 0.0f, 0.0f}, + 150.0f, + 600.0f, + } } }; diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp index 588b0318e6..f238b3ed5e 100644 --- a/src/d/actor/d_a_canoe.cpp +++ b/src/d/actor/d_a_canoe.cpp @@ -80,10 +80,12 @@ static dCcD_SrcCyl l_cylSrc = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 55.0f, // mRadius - 80.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 55.0f, // mRadius + 80.0f // mHeight + } // mCyl + } }; int daCanoe_c::create() { diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp index c07eca7aff..833a9f5892 100644 --- a/src/d/actor/d_a_cstaF.cpp +++ b/src/d/actor/d_a_cstaF.cpp @@ -92,10 +92,12 @@ static dCcD_SrcCyl l_cylSrc = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 125.0f, // mRadius - 390.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 125.0f, // mRadius + 390.0f // mHeight + } // mCyl + } }; int daCstaF_c::create() { diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index 3c8b7ce917..3c7b71b1a2 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -99,12 +99,14 @@ static dCcD_SrcCyl l_cylSrc = { {dCcD_SE_STONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x5, 0x0, 0x0, 0x3}, // mGObjTg {0x0}, // mGObjCo - }, // mObjInf + }, + { // mObjInf { {0.0f, 0.0f, 0.0f}, // mCenter 88.0f, // mRadius 392.0f // mHeight - } // mCyl + } // mCyl + } }; static dCcD_SrcSph l_sphSrc = { diff --git a/src/d/actor/d_a_e_ai.cpp b/src/d/actor/d_a_e_ai.cpp index 8e8841ffc2..a35bee546a 100644 --- a/src/d/actor/d_a_e_ai.cpp +++ b/src/d/actor/d_a_e_ai.cpp @@ -79,10 +79,12 @@ void e_ai_class::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 80.0f, // mRadius - 250.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 80.0f, // mRadius + 250.0f // mHeight + } // mCyl + } }; m_ccCyl.Set(cc_cyl_src); diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index 529ca90348..85ffee70bb 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -770,10 +770,12 @@ static cPhs__Step daE_Bee_Create(fopAc_ac_c* i_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 130.0f // mHeight - } // mCcCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 130.0f // mHeight + } // mCcCyl + } }; _this->mCcCyl.Set(cc_cyl_src); _this->mCcCyl.SetStts(&_this->mCcStts); diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index c120f8a19f..b5a43fa168 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -915,10 +915,12 @@ static cPhs__Step daE_BI_Create(fopAc_ac_c* actor) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 20.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 20.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph at_sph_src = { diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index ac61d6deed..3f431340ec 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -61,12 +61,14 @@ void daE_DF_c::initCcCylinder() { {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x1}, // mGObjTg {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 150.0f, // mRadius - 158.0f // mHeight - } // mCyl + }, + { // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 150.0f, // mRadius + 158.0f // mHeight + } // mCyl + } }; mStts.Init(0xff, 0xff, this); diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index 397ace06ad..7ab29d6fca 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -794,10 +794,12 @@ static cPhs__Step daE_Fs_Create(fopAc_ac_c* i_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 80.0f, // mRadius - 230.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 80.0f, // mRadius + 230.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph at_sph_src = { diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index 83e265b3eb..5bbec45128 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -1637,10 +1637,12 @@ static cPhs__Step daE_GB_Create(fopAc_ac_c* actor) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 20.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 20.0f // mHeight + } // mCyl + } }; e_gb_class* i_this = (e_gb_class*)actor; diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index 4eb4202437..483f0d8346 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -36,9 +36,11 @@ static dCcD_SrcCyl cc_hp_src = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 50.0f, - 300.0f, + { + {0.0f, 0.0f, 0.0f}, + 50.0f, + 300.0f, + } } }; @@ -62,9 +64,11 @@ static dCcD_SrcCyl cc_hp_at_src = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 50.0f, - 300.0f, + { + {0.0f, 0.0f, 0.0f}, + 50.0f, + 300.0f, + } } }; } // namespace diff --git a/src/d/actor/d_a_e_is.cpp b/src/d/actor/d_a_e_is.cpp index f95bba1755..1379fbf62e 100644 --- a/src/d/actor/d_a_e_is.cpp +++ b/src/d/actor/d_a_e_is.cpp @@ -691,10 +691,12 @@ static int daE_IS_Create(fopAc_ac_c* i_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 200.0f, // mRadius - 250.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 200.0f, // mRadius + 250.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph core_sph_src = { diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp index a2838ee4da..8e298b5dd4 100644 --- a/src/d/actor/d_a_e_kk.cpp +++ b/src/d/actor/d_a_e_kk.cpp @@ -50,10 +50,12 @@ static dCcD_SrcCyl cc_kk_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph cc_kk_at_src = { diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp index 863482cd7e..cd109f1e16 100644 --- a/src/d/actor/d_a_e_md.cpp +++ b/src/d/actor/d_a_e_md.cpp @@ -33,10 +33,12 @@ void daE_MD_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 60.0f, // mRadius - 350.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 60.0f, // mRadius + 350.0f // mHeight + } // mCyl + } }; mCcStts.Init(200, 0xFF, this); diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 44fa483e6e..b02feff7bf 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -1035,10 +1035,12 @@ static cPhs__Step daE_Nest_Create(fopAc_ac_c* i_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 5.0f, // mRadius - 10.0f // mHeight - } // mCcCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 5.0f, // mRadius + 10.0f // mHeight + } // mCcCyl + } }; _this->mCcCyl.Set(cc_cyl_src); _this->mCcCyl.SetStts(&_this->mCcStts); diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index 9fe29edb9b..b9c75e830a 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -238,10 +238,12 @@ void daE_PM_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 130.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 130.0f // mHeight + } // mCyl + } }; mCcStts.Init(0xff, 0xff, this); diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 6db6e2b4b7..04e8bf0ff8 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -2954,10 +2954,12 @@ static int daE_PO_Create(fopAc_ac_c* i_act_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 300.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 300.0f // mHeight + } // mCyl + } }; i_this->mCyl.Set(cc_cyl_src); diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index 389f550e1c..9241a33234 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -40,10 +40,12 @@ static dCcD_SrcCyl cc_pz_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 300.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 300.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcSph cc_pz_at_src = { @@ -66,10 +68,12 @@ static dCcD_SrcCyl cc_pz_wp_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 300.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 300.0f // mHeight + } // mCyl + } // mCylAttr }; } diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index ce2532cb50..f5c533fcb7 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -1808,10 +1808,12 @@ static int daE_RDB_Create(fopAc_ac_c* actor) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 100.0f, // mRadius - 200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 100.0f, // mRadius + 200.0f // mHeight + } // mCyl + } }; e_rdb_class* i_this = (e_rdb_class*)actor; diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp index 9b793f4a6d..b9b744d2ea 100644 --- a/src/d/actor/d_a_e_sb.cpp +++ b/src/d/actor/d_a_e_sb.cpp @@ -92,10 +92,12 @@ void daE_SB_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 80.0f, // mRadius - 130.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 80.0f, // mRadius + 130.0f // mHeight + } // mCyl + } }; mStts.Init(0xFE, 0xFF, this); diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index 41c9d2a143..40b67695fe 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -3095,10 +3095,12 @@ static cPhs__Step daE_ST_Create(fopAc_ac_c* a_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 2000.0f // mHeight - } // mLineCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 2000.0f // mHeight + } // mLineCyl + } }; static dCcD_SrcSph def_sph_src = { diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index b131638ec9..e3e0b9de5f 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -123,10 +123,12 @@ static dCcD_SrcCyl cc_vt_body_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 150.0f, // mRadius - 158.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 150.0f, // mRadius + 158.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph cc_vt_attack_src = { diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 5ce16590e1..996cdf036e 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -92,7 +92,9 @@ namespace { {0} }, { - {0.0f, 0.0f, 0.0f}, 50.0f, 300.0f, + { + {0.0f, 0.0f, 0.0f}, 50.0f, 300.0f, + } } }; @@ -104,7 +106,9 @@ namespace { {0}, }, { - {0.0f, 0.0f, 0.0f}, 50.0f, 300.0f, + { + {0.0f, 0.0f, 0.0f}, 50.0f, 300.0f, + } } }; } diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp index 8fa15b01f4..1e67b6c317 100644 --- a/src/d/actor/d_a_e_zm.cpp +++ b/src/d/actor/d_a_e_zm.cpp @@ -78,8 +78,10 @@ namespace { {0}, }, { - {0.0f, 0.0f, 0.0f}, 50.0f, 300.0f, - }, + { + {0.0f, 0.0f, 0.0f}, 50.0f, 300.0f, + }, + } }; static dCcD_SrcSph cc_zm_at_src = { diff --git a/src/d/actor/d_a_e_zs.cpp b/src/d/actor/d_a_e_zs.cpp index cba87d9373..805a0d28c3 100644 --- a/src/d/actor/d_a_e_zs.cpp +++ b/src/d/actor/d_a_e_zs.cpp @@ -28,10 +28,12 @@ static dCcD_SrcCyl cc_zs_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 130.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 130.0f // mHeight + } // mCyl + } }; } diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index f2a1c2aae1..9eed297ef2 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -859,10 +859,12 @@ static int daEp_Create(fopAc_ac_c* a_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 35.0f, // mRadius - 120.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 35.0f, // mRadius + 120.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph at_sph_src = { diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 5e5784216f..a99b8d4b8f 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -222,10 +222,12 @@ static dCcD_SrcCyl l_cylSrc = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 230.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 230.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph l_sphSrc = { diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index 4ab9b65da0..ab644a3c73 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -3767,10 +3767,12 @@ static int daMg_Fish_Create(fopAc_ac_c* i_this) { { 0 }, // mGObjCo }, // mObjInf { - { 0.0f, 0.0f, 0.0f }, // mCenter - 35.0f, // mRadius - 35.0f // mHeight - } // mCyl + { + { 0.0f, 0.0f, 0.0f }, // mCenter + 35.0f, // mRadius + 35.0f // mHeight + } // mCyl + } }; static f32 fish_max[11] = { 0.828f, diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index 56dca96b1e..49c17d8129 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -1231,10 +1231,12 @@ void daNpcT_DmgStagger_c::calc(BOOL param_0) { dCcD_SrcCyl daNpcT_c::mCcDCyl = { daNpcT_c::mCcDObjData, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; dCcD_SrcSph daNpcT_c::mCcDSph = { diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp index 6f5b85bc0f..2558f4c092 100644 --- a/src/d/actor/d_a_npc2.cpp +++ b/src/d/actor/d_a_npc2.cpp @@ -10,10 +10,12 @@ static s16 daBaseNpc_getGroundAngle(cBgS_PolyInfo* param_0, s16 param_1); dCcD_SrcCyl daBaseNpc_c::mCcDCyl = { daBaseNpc_c::mCcDObj, { + { {0.0f, 0.0f, 0.0f}, // mCenter 0.0f, // mRadius 0.0f // mHeight } // mCyl + } }; dCcD_SrcSph daBaseNpc_c::mCcDSph = { diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp index 4b873a8db6..a8f6db90d5 100644 --- a/src/d/actor/d_a_npc4.cpp +++ b/src/d/actor/d_a_npc4.cpp @@ -710,10 +710,12 @@ void daNpcF_c::tgHitCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_1, fopAc_ac dCcD_SrcCyl daNpcF_c::mCcDCyl = { daNpcF_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; dCcD_SrcSph daNpcF_c::mCcDSph = { diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp index 4d046c03b6..32b934b090 100644 --- a/src/d/actor/d_a_npc_blue_ns.cpp +++ b/src/d/actor/d_a_npc_blue_ns.cpp @@ -69,10 +69,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; const daNpcBlueNS_HIOParam daNpcBlueNS_Param_c::m = { diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp index dde66fd193..629f029a92 100644 --- a/src/d/actor/d_a_npc_cd.cpp +++ b/src/d/actor/d_a_npc_cd.cpp @@ -165,12 +165,14 @@ dCcD_SrcCyl const daNpcCd_c::m_cylDat = { {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0}, // mGObjTg {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + }, + { // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daNpcCd_c::NpcCreate(int param_1) { diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp index 72f4dc7f5e..721afc93f3 100644 --- a/src/d/actor/d_a_npc_cd2.cpp +++ b/src/d/actor/d_a_npc_cd2.cpp @@ -187,10 +187,12 @@ dCcD_SrcCyl const daNpcCd2_c::m_cylDat = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daNpcCd2_c::NpcCreate(int param_1) { diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp index 43600c6ae2..aadb0e25f7 100644 --- a/src/d/actor/d_a_npc_coach.cpp +++ b/src/d/actor/d_a_npc_coach.cpp @@ -430,7 +430,9 @@ void daNpcCoach_c::initCollision() { 0, }, { - 0.0f, 0.0f + { + 0.0f, 0.0f + } } }; diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index ab87d87d6a..f29e6b64fc 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -18,7 +18,9 @@ dCcD_SrcCyl daNpc_Kn_c::mCcDCyl = { mCcDObjData, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}, + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}, + } }; dCcD_SrcSph daNpc_Kn_c::mCcDSph = { diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 3d65fb561d..0ddaae6de8 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -7324,10 +7324,12 @@ static int daNpc_Ks_Create(fopAc_ac_c* actor) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 20.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 20.0f // mHeight + } // mCyl + } }; npc_ks_class* i_this = (npc_ks_class*)actor; diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp index 3be79434ac..78157b3ba8 100644 --- a/src/d/actor/d_a_npc_shop0.cpp +++ b/src/d/actor/d_a_npc_shop0.cpp @@ -51,10 +51,12 @@ dCcD_SrcCyl const daNpc_Shop0_c::mCylDat = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; daNpc_Shop0_Param_c::param const daNpc_Shop0_Param_c::mParam = { diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp index c847b96223..35711715ed 100644 --- a/src/d/actor/d_a_obj_Turara.cpp +++ b/src/d/actor/d_a_obj_Turara.cpp @@ -66,10 +66,12 @@ const dCcD_SrcGObjInf daTurara_c::mCcDObjInfo = { dCcD_SrcCyl daTurara_c::mCcDCyl = { daTurara_c::mCcDObjInfo, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static u32 const l_bmdIdx[2] = {5, 8}; diff --git a/src/d/actor/d_a_obj_TvCdlst.cpp b/src/d/actor/d_a_obj_TvCdlst.cpp index 8f07b81887..fd365f58f8 100644 --- a/src/d/actor/d_a_obj_TvCdlst.cpp +++ b/src/d/actor/d_a_obj_TvCdlst.cpp @@ -13,10 +13,12 @@ static daTvCdlst_HIO_c l_HIO; dCcD_SrcCyl daTvCdlst_c::mCcDCyl = { daTvCdlst_c::mCcDObjInfo, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } // mCylAttr }; daTvCdlst_HIO_c::daTvCdlst_HIO_c() { diff --git a/src/d/actor/d_a_obj_Y_taihou.cpp b/src/d/actor/d_a_obj_Y_taihou.cpp index cf51e021af..970a5662b3 100644 --- a/src/d/actor/d_a_obj_Y_taihou.cpp +++ b/src/d/actor/d_a_obj_Y_taihou.cpp @@ -136,10 +136,12 @@ static dCcD_SrcCyl l_cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 120.0f, // mRadius - 200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 120.0f, // mRadius + 200.0f // mHeight + } // mCyl + } }; void daObjYtaihou_c::setNextAngle() { diff --git a/src/d/actor/d_a_obj_automata.cpp b/src/d/actor/d_a_obj_automata.cpp index aecb349f3e..1ee6793581 100644 --- a/src/d/actor/d_a_obj_automata.cpp +++ b/src/d/actor/d_a_obj_automata.cpp @@ -34,10 +34,12 @@ static dCcD_SrcGObjInf const l_ccDObjData = static dCcD_SrcCyl l_ccDCyl = { l_ccDObjData, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph l_ccDSph = { diff --git a/src/d/actor/d_a_obj_barDesk.cpp b/src/d/actor/d_a_obj_barDesk.cpp index 28ba74c407..85cb7f5955 100644 --- a/src/d/actor/d_a_obj_barDesk.cpp +++ b/src/d/actor/d_a_obj_barDesk.cpp @@ -21,7 +21,9 @@ dCcD_SrcGObjInf const daBarDesk_c::mCcDObjInfo = { dCcD_SrcCyl daBarDesk_c::mCcDCyl = { mCcDObjInfo, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + } }; daBarDesk_HIO_c::daBarDesk_HIO_c() : field_0x4(10), field_0x5(3) { diff --git a/src/d/actor/d_a_obj_bbox.cpp b/src/d/actor/d_a_obj_bbox.cpp index 89c373c168..2a645ae557 100644 --- a/src/d/actor/d_a_obj_bbox.cpp +++ b/src/d/actor/d_a_obj_bbox.cpp @@ -17,10 +17,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 90.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 90.0f, // mRadius + 100.0f // mHeight + } // mCyl + } }; static char* l_arcName = "M_BBox"; diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 788e24e294..52d796d6b5 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -113,10 +113,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 15.0f, // mRadius - 60.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 15.0f, // mRadius + 60.0f // mHeight + } // mCyl + } }; diff --git a/src/d/actor/d_a_obj_bhashi.cpp b/src/d/actor/d_a_obj_bhashi.cpp index a5b7a104ca..a09728a02c 100644 --- a/src/d/actor/d_a_obj_bhashi.cpp +++ b/src/d/actor/d_a_obj_bhashi.cpp @@ -19,10 +19,12 @@ void daObjBHASHI_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 300.0f, // mRadius - 2200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 300.0f, // mRadius + 2200.0f // mHeight + } // mCyl + } }; mCcStts.Init(0xFF, 0xFF, this); diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index fae6153ae1..f5894f7c7a 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -131,10 +131,12 @@ dCcD_SrcCyl const daBkyRock_c::s_CcDCyl = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static int const BMD_IDX[2][3] = { diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp index aa9a59c5b2..eadbca6baa 100644 --- a/src/d/actor/d_a_obj_bmWindow.cpp +++ b/src/d/actor/d_a_obj_bmWindow.cpp @@ -125,10 +125,12 @@ static daBmWindow_HIO_c l_HIO; dCcD_SrcCyl daBmWindow_c::mCcDCyl = { daBmWindow_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f, // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f, // mHeight + } // mCyl + } }; void daBmWindow_c::windowProc() { diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp index b16c183506..95ca898d01 100644 --- a/src/d/actor/d_a_obj_boumato.cpp +++ b/src/d/actor/d_a_obj_boumato.cpp @@ -29,10 +29,12 @@ static dCcD_SrcGObjInf const l_ccDObjData = static dCcD_SrcCyl l_ccDCyl = { l_ccDObjData, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static char* l_resName = "H_BouMato"; diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index c82fb96e7c..fd00d5b5a4 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -1429,10 +1429,12 @@ static void CreateInit(fopAc_ac_c* i_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 5.0f, // mRadius - 1000.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 5.0f, // mRadius + 1000.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl wire_cyl_src = { @@ -1443,10 +1445,12 @@ static void CreateInit(fopAc_ac_c* i_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 5.0f, // mRadius - 1000.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 5.0f, // mRadius + 1000.0f // mHeight + } // mCyl + } // mCylAttr }; br_s* part = a_this->mBr; diff --git a/src/d/actor/d_a_obj_bubblePilar.cpp b/src/d/actor/d_a_obj_bubblePilar.cpp index fd4d53a350..7fcf42ae80 100644 --- a/src/d/actor/d_a_obj_bubblePilar.cpp +++ b/src/d/actor/d_a_obj_bubblePilar.cpp @@ -20,7 +20,9 @@ const dCcD_SrcGObjInf daBubbPilar_c::mCcDObjInfo = { dCcD_SrcCyl daBubbPilar_c::mCcDCyl = { daBubbPilar_c::mCcDObjInfo, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + } }; daBubbPilar_HIO_c::daBubbPilar_HIO_c() { diff --git a/src/d/actor/d_a_obj_burnbox.cpp b/src/d/actor/d_a_obj_burnbox.cpp index 70b6ce41c6..f8f5123570 100644 --- a/src/d/actor/d_a_obj_burnbox.cpp +++ b/src/d/actor/d_a_obj_burnbox.cpp @@ -40,10 +40,12 @@ const dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 100.0f // mHeight + } // mCyl + } }; int daObjBurnBox_c::Create() { diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index 8363d91bbe..cb4b785a34 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -665,10 +665,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 10.0f, // mRadius - 50.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 10.0f, // mRadius + 50.0f // mHeight + } // mCyl + } // mCylAttr }; const static dCcD_SrcSph l_light_at_sph_src = { @@ -703,10 +705,12 @@ const static dCcD_SrcCyl l_tg_cyl = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 60.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 60.0f // mHeight + } // mCyl + } // mCylAttr }; static const GXColor l_light_color = {0xFF, 0xFF, 0xFF, 0xFF}; diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp index fc4a336e62..d608eab9f5 100644 --- a/src/d/actor/d_a_obj_cblock.cpp +++ b/src/d/actor/d_a_obj_cblock.cpp @@ -65,10 +65,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { + { {0.0f, 0.0f, 0.0f}, // mCenter 60.0f, // mRadius 300.0f // mHeight } // mCyl + } }; #if DEBUG diff --git a/src/d/actor/d_a_obj_chest.cpp b/src/d/actor/d_a_obj_chest.cpp index 8e74fad3e3..1e904f28a0 100644 --- a/src/d/actor/d_a_obj_chest.cpp +++ b/src/d/actor/d_a_obj_chest.cpp @@ -28,10 +28,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 260.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 260.0f // mHeight + } // mCyl + } }; void daObjChest_c::setBaseMtx() { diff --git a/src/d/actor/d_a_obj_crvlh_down.cpp b/src/d/actor/d_a_obj_crvlh_down.cpp index 2be8d83865..bc66b5cf50 100644 --- a/src/d/actor/d_a_obj_crvlh_down.cpp +++ b/src/d/actor/d_a_obj_crvlh_down.cpp @@ -24,10 +24,12 @@ void daObjCRVLH_DW_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 250.0f, // mRadius - 400.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 250.0f, // mRadius + 400.0f // mHeight + } // mCyl + } }; mStts.Init(0xff, 0xff, this); diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index 418de6547e..87d7158cd7 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -91,10 +91,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 70.0f, // mRadius - 450.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 70.0f, // mRadius + 450.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl l_cyl_src2 = { @@ -105,10 +107,12 @@ static dCcD_SrcCyl l_cyl_src2 = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 60.0f, // mRadius - 300.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 60.0f, // mRadius + 300.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcSph l_sph_src = { diff --git a/src/d/actor/d_a_obj_fireWood.cpp b/src/d/actor/d_a_obj_fireWood.cpp index aab5c4406e..7fe9d9c9fa 100644 --- a/src/d/actor/d_a_obj_fireWood.cpp +++ b/src/d/actor/d_a_obj_fireWood.cpp @@ -24,10 +24,12 @@ static daFireWood_HIO_c l_HIO; dCcD_SrcCyl daFireWood_c::mCcDCyl = { daFireWood_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; const dCcD_SrcGObjInf daFireWood_c::mCcDObjInfo = { diff --git a/src/d/actor/d_a_obj_fireWood2.cpp b/src/d/actor/d_a_obj_fireWood2.cpp index 26df7b03a3..a1d04e396e 100644 --- a/src/d/actor/d_a_obj_fireWood2.cpp +++ b/src/d/actor/d_a_obj_fireWood2.cpp @@ -31,10 +31,12 @@ const dCcD_SrcGObjInf daFireWood2_c::mCcDObjInfo = { dCcD_SrcCyl daFireWood2_c::mCcDCyl = { daFireWood2_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static cull_box l_cull_box = { diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp index ab824c1328..578b62b029 100644 --- a/src/d/actor/d_a_obj_flag2.cpp +++ b/src/d/actor/d_a_obj_flag2.cpp @@ -349,10 +349,12 @@ void daObjFlag2_c::initCollision() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 15.0f, // mRadius - 30.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 15.0f, // mRadius + 30.0f // mHeight + } // mCyl + } }; mStts.Init(0xff, 0xff, this); mCyl.Set(ccCylSrc); diff --git a/src/d/actor/d_a_obj_gadget.cpp b/src/d/actor/d_a_obj_gadget.cpp index 3ce3d54be9..67fe8bd6eb 100644 --- a/src/d/actor/d_a_obj_gadget.cpp +++ b/src/d/actor/d_a_obj_gadget.cpp @@ -59,10 +59,12 @@ static char* l_resNameList[2] = { static dCcD_SrcCyl l_ccDCyl = { l_ccDObjData, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; #if DEBUG diff --git a/src/d/actor/d_a_obj_gpTaru.cpp b/src/d/actor/d_a_obj_gpTaru.cpp index 08b879ad16..5e01a5bf17 100644 --- a/src/d/actor/d_a_obj_gpTaru.cpp +++ b/src/d/actor/d_a_obj_gpTaru.cpp @@ -62,10 +62,12 @@ int daGpTaru_c::CreateHeap() { dCcD_SrcCyl daGpTaru_c::mCcDCyl = { daGpTaru_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } // mCylAttr }; const dCcD_SrcGObjInf daGpTaru_c::mCcDObjInfo = { diff --git a/src/d/actor/d_a_obj_graWall.cpp b/src/d/actor/d_a_obj_graWall.cpp index ee5911eea5..44b6b034c0 100644 --- a/src/d/actor/d_a_obj_graWall.cpp +++ b/src/d/actor/d_a_obj_graWall.cpp @@ -58,10 +58,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; void daObjGraWall_c::col_init() { diff --git a/src/d/actor/d_a_obj_gra_rock.cpp b/src/d/actor/d_a_obj_gra_rock.cpp index 230e26e297..980bfd05c1 100644 --- a/src/d/actor/d_a_obj_gra_rock.cpp +++ b/src/d/actor/d_a_obj_gra_rock.cpp @@ -24,10 +24,12 @@ dCcD_SrcCyl const daObjGraRock_c::mCcDCyl = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + }, }; void daObjGraRock_c::setAttnPos() { diff --git a/src/d/actor/d_a_obj_grave_stone.cpp b/src/d/actor/d_a_obj_grave_stone.cpp index b5a3c9e105..8d1a5b3ab8 100644 --- a/src/d/actor/d_a_obj_grave_stone.cpp +++ b/src/d/actor/d_a_obj_grave_stone.cpp @@ -26,7 +26,9 @@ dCcD_SrcCyl const daGraveStone_c::mCcDCyl = { {0, 0, 0, 0, 0}, {0}, }, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}, + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}, + }, }; void daGraveStone_c::setBaseMtx() { diff --git a/src/d/actor/d_a_obj_hakai_brl.cpp b/src/d/actor/d_a_obj_hakai_brl.cpp index 3d8d31f782..756ee528ab 100644 --- a/src/d/actor/d_a_obj_hakai_brl.cpp +++ b/src/d/actor/d_a_obj_hakai_brl.cpp @@ -90,10 +90,12 @@ dCcD_SrcCyl const daObjHBarrel_c::s_CcDCyl = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; void daObjHBarrel_c::init() { diff --git a/src/d/actor/d_a_obj_hakai_ftr.cpp b/src/d/actor/d_a_obj_hakai_ftr.cpp index 63c0a93b99..e1f42e611b 100644 --- a/src/d/actor/d_a_obj_hakai_ftr.cpp +++ b/src/d/actor/d_a_obj_hakai_ftr.cpp @@ -105,12 +105,14 @@ dCcD_SrcCyl const daObjHFtr_c::s_CcDCyl = { {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + }, + { // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daObjHFtr_c::execute() { diff --git a/src/d/actor/d_a_obj_hbombkoya.cpp b/src/d/actor/d_a_obj_hbombkoya.cpp index ceb8a96a30..c701ffbf0e 100644 --- a/src/d/actor/d_a_obj_hbombkoya.cpp +++ b/src/d/actor/d_a_obj_hbombkoya.cpp @@ -52,10 +52,12 @@ static dCcD_SrcCyl l_cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 1000.0f, // mRadius - 1000.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 1000.0f, // mRadius + 1000.0f // mHeight + } // mCyl + } // mCylAttr }; int daObjHBombkoya_c::Create() { diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp index 05ff5a8298..78c7653e70 100644 --- a/src/d/actor/d_a_obj_hhashi.cpp +++ b/src/d/actor/d_a_obj_hhashi.cpp @@ -25,10 +25,12 @@ void daObjHHASHI_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 110.0f, // mRadius - 158.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 110.0f, // mRadius + 158.0f // mHeight + } // mCyl + } }; mStts.Init(0xff, 0xff, this); diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 836f68d71d..43a078154c 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -124,10 +124,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 180.0f, // mRadius - 290.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 180.0f, // mRadius + 290.0f // mHeight + } // mCyl + } }; int daObjIceBlk_c::saveCurrentPos() { diff --git a/src/d/actor/d_a_obj_iceleaf.cpp b/src/d/actor/d_a_obj_iceleaf.cpp index e5fd929932..f146c0da91 100644 --- a/src/d/actor/d_a_obj_iceleaf.cpp +++ b/src/d/actor/d_a_obj_iceleaf.cpp @@ -83,10 +83,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 100.0f // mHeight + } // mCyl + } }; int daObjIceLeaf_c::Create() { diff --git a/src/d/actor/d_a_obj_inobone.cpp b/src/d/actor/d_a_obj_inobone.cpp index ab7e95e1c4..64ab337594 100644 --- a/src/d/actor/d_a_obj_inobone.cpp +++ b/src/d/actor/d_a_obj_inobone.cpp @@ -47,10 +47,12 @@ static const dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 140.0f, // mRadius - 70.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 140.0f, // mRadius + 70.0f // mHeight + } // mCyl + } // mCylAttr }; static const dCcD_SrcCyl l_cyl_src2 = { @@ -61,10 +63,12 @@ static const dCcD_SrcCyl l_cyl_src2 = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 140.0f, // mRadius - 70.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 140.0f, // mRadius + 70.0f // mHeight + } // mCyl + } // mCylAttr }; static void* s_boar_sub(void* i_actor, void* i_data) { diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index 9170050135..919629415b 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -1167,10 +1167,12 @@ const dCcD_SrcCyl daItem_c::m_cyl_src = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 10.0f, - 50.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 10.0f, + 50.0f, + }, + } }; void daItem_c::initSpeed(BOOL i_noTypeChk) { diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp index 9f573a1bdd..6f25e54dd2 100644 --- a/src/d/actor/d_a_obj_kago.cpp +++ b/src/d/actor/d_a_obj_kago.cpp @@ -53,10 +53,12 @@ static char* l_resNameList[2] = { static dCcD_SrcCyl l_ccDCyl = { daNpcT_c::mCcDObjData, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; daObj_Kago_c::~daObj_Kago_c() { diff --git a/src/d/actor/d_a_obj_kaisou.cpp b/src/d/actor/d_a_obj_kaisou.cpp index 3b809ccc52..bd5c84cfaa 100644 --- a/src/d/actor/d_a_obj_kaisou.cpp +++ b/src/d/actor/d_a_obj_kaisou.cpp @@ -106,10 +106,12 @@ void daObjKaisou_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 100.0f // mHeight + } // mCyl + } }; mCyl.Set(ccCylSrc); mCyl.SetStts(&mStts); diff --git a/src/d/actor/d_a_obj_kantera.cpp b/src/d/actor/d_a_obj_kantera.cpp index c558db9b7b..93240748bd 100644 --- a/src/d/actor/d_a_obj_kantera.cpp +++ b/src/d/actor/d_a_obj_kantera.cpp @@ -23,10 +23,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 20.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 20.0f, // mRadius + 40.0f // mHeight + } // mCyl + } // mCylAttr }; static f32 Reflect(cXyz* i_xyz, cBgS_PolyInfo const& param_2, f32 param_3) { diff --git a/src/d/actor/d_a_obj_kazeneko.cpp b/src/d/actor/d_a_obj_kazeneko.cpp index f964e7eac8..f758d2ffed 100644 --- a/src/d/actor/d_a_obj_kazeneko.cpp +++ b/src/d/actor/d_a_obj_kazeneko.cpp @@ -55,10 +55,12 @@ const static dCcD_SrcCyl ccCylSrc = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 10.0f, // mRadius - 30.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 10.0f, // mRadius + 30.0f // mHeight + } // mCyl + } }; void daObjKazeNeko_c::initCcCylinder() { diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index 586cf56ccd..33895045cd 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -30,10 +30,12 @@ static const dCcD_SrcGObjInf l_ccDObjData = { static dCcD_SrcCyl l_ccDCyl = { l_ccDObjData, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static daObj_KBacket_Param_c l_HIO; diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp index 909a14616b..8866ac7a4c 100644 --- a/src/d/actor/d_a_obj_kgate.cpp +++ b/src/d/actor/d_a_obj_kgate.cpp @@ -65,10 +65,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 350.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 350.0f // mHeight + } // mCyl + } }; void daObjKGate_c::initBaseMtx() { diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp index 1723ab03c5..002c0e66e3 100644 --- a/src/d/actor/d_a_obj_klift00.cpp +++ b/src/d/actor/d_a_obj_klift00.cpp @@ -96,10 +96,12 @@ static dCcD_SrcCyl l_cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 300.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 300.0f, // mRadius + 100.0f // mHeight + } // mCyl + } // mCylAttr }; #if DEBUG diff --git a/src/d/actor/d_a_obj_ktOnFire.cpp b/src/d/actor/d_a_obj_ktOnFire.cpp index e9608f761e..b866dc0811 100644 --- a/src/d/actor/d_a_obj_ktOnFire.cpp +++ b/src/d/actor/d_a_obj_ktOnFire.cpp @@ -35,10 +35,12 @@ const dCcD_SrcGObjInf daKtOnFire_c::mCcDObjInfo = { dCcD_SrcCyl daKtOnFire_c::mCcDCyl = { mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; daKtOnFire_HIO_c::daKtOnFire_HIO_c() { diff --git a/src/d/actor/d_a_obj_laundry.cpp b/src/d/actor/d_a_obj_laundry.cpp index 49d47d1f8e..e5a6923793 100644 --- a/src/d/actor/d_a_obj_laundry.cpp +++ b/src/d/actor/d_a_obj_laundry.cpp @@ -65,10 +65,12 @@ const static dCcD_SrcCyl ccCylSrc = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, -80.0f, 0.0f}, // mCenter - 25.0f, // mRadius - 25.0f // mHeight - } // mCyl + { + {0.0f, -80.0f, 0.0f}, // mCenter + 25.0f, // mRadius + 25.0f // mHeight + } // mCyl + } }; static f32 dummy(cXyz v) { diff --git a/src/d/actor/d_a_obj_life_container.cpp b/src/d/actor/d_a_obj_life_container.cpp index 4924d14d85..8f89c82a04 100644 --- a/src/d/actor/d_a_obj_life_container.cpp +++ b/src/d/actor/d_a_obj_life_container.cpp @@ -19,10 +19,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 20.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 20.0f, // mRadius + 40.0f // mHeight + } // mCyl + } }; static f32 Reflect(cXyz* i_vec, cBgS_PolyInfo const& i_wallpoly, f32 i_scale) { diff --git a/src/d/actor/d_a_obj_lv1Candle00.cpp b/src/d/actor/d_a_obj_lv1Candle00.cpp index 7b328b5059..701f474814 100644 --- a/src/d/actor/d_a_obj_lv1Candle00.cpp +++ b/src/d/actor/d_a_obj_lv1Candle00.cpp @@ -25,7 +25,9 @@ dCcD_SrcGObjInf const daLv1Cdl00_c::mCcDObjInfo = { dCcD_SrcCyl daLv1Cdl00_c::mCcDCyl = { daLv1Cdl00_c::mCcDObjInfo, - { {0.0f, 0.0f, 0.0f}, 0, 0} + { + { {0.0f, 0.0f, 0.0f}, 0, 0} + } }; daLv1Cdl00_HIO_c::daLv1Cdl00_HIO_c() : diff --git a/src/d/actor/d_a_obj_lv1Candle01.cpp b/src/d/actor/d_a_obj_lv1Candle01.cpp index e5558ed550..916b73bdb9 100644 --- a/src/d/actor/d_a_obj_lv1Candle01.cpp +++ b/src/d/actor/d_a_obj_lv1Candle01.cpp @@ -25,7 +25,9 @@ dCcD_SrcGObjInf const daLv1Cdl01_c::mCcDObjInfo = { dCcD_SrcCyl daLv1Cdl01_c::mCcDCyl = { daLv1Cdl01_c::mCcDObjInfo, - { {0.0f, 0.0f, 0.0f}, 0, 0} + { + { {0.0f, 0.0f, 0.0f}, 0, 0} + } }; daLv1Cdl01_HIO_c::daLv1Cdl01_HIO_c() : diff --git a/src/d/actor/d_a_obj_lv2Candle.cpp b/src/d/actor/d_a_obj_lv2Candle.cpp index 28d7f1cb58..d0e7100c44 100644 --- a/src/d/actor/d_a_obj_lv2Candle.cpp +++ b/src/d/actor/d_a_obj_lv2Candle.cpp @@ -50,7 +50,9 @@ dCcD_SrcGObjInf const daLv2Candle_c::mCcDObjInfo = { dCcD_SrcCyl daLv2Candle_c::mCcDCyl = { daLv2Candle_c::mCcDObjInfo, - { {0.0f, 0.0f, 0.0f}, 0, 0} + { + { {0.0f, 0.0f, 0.0f}, 0, 0} + } }; static char* l_resNameIdx[3] = { diff --git a/src/d/actor/d_a_obj_lv5FloorBoard.cpp b/src/d/actor/d_a_obj_lv5FloorBoard.cpp index f94f8ba986..74206ac37b 100644 --- a/src/d/actor/d_a_obj_lv5FloorBoard.cpp +++ b/src/d/actor/d_a_obj_lv5FloorBoard.cpp @@ -86,10 +86,12 @@ const dCcD_SrcGObjInf daFlorBoad_c::mCcDObjInfo = { dCcD_SrcCyl daFlorBoad_c::mCcDCyl = { daFlorBoad_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; void daFlorBoad_c::procMain() { diff --git a/src/d/actor/d_a_obj_lv5IceWall.cpp b/src/d/actor/d_a_obj_lv5IceWall.cpp index 36c21f56d6..7eedee6c61 100644 --- a/src/d/actor/d_a_obj_lv5IceWall.cpp +++ b/src/d/actor/d_a_obj_lv5IceWall.cpp @@ -60,10 +60,12 @@ const dCcD_SrcGObjInf daIceWall_c::mCcDObjInfo = { dCcD_SrcCyl daIceWall_c::mCcDCyl = { daIceWall_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } // mCylAttr }; static const int l_bmdIdx[] = {4, 5}; diff --git a/src/d/actor/d_a_obj_lv5SwIce.cpp b/src/d/actor/d_a_obj_lv5SwIce.cpp index da91936bfa..e4a644a5fe 100644 --- a/src/d/actor/d_a_obj_lv5SwIce.cpp +++ b/src/d/actor/d_a_obj_lv5SwIce.cpp @@ -80,10 +80,12 @@ const dCcD_SrcGObjInf daLv5SwIce_c::mCcDObjInfo = { dCcD_SrcCyl daLv5SwIce_c::mCcDCyl = { daLv5SwIce_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; void daLv5SwIce_c::procMain() { diff --git a/src/d/actor/d_a_obj_lv5ychndlr.cpp b/src/d/actor/d_a_obj_lv5ychndlr.cpp index eeeecdc351..0bd3dcdb97 100644 --- a/src/d/actor/d_a_obj_lv5ychndlr.cpp +++ b/src/d/actor/d_a_obj_lv5ychndlr.cpp @@ -114,10 +114,12 @@ static dCcD_SrcCyl l_cc_src_shaft_cyl = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 100.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl l_cc_cyl_src = { @@ -128,10 +130,12 @@ static dCcD_SrcCyl l_cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 350.0f, // mRadius - 150.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 350.0f, // mRadius + 150.0f // mHeight + } // mCyl + } // mCylAttr }; int daObjYchndlr_c::Create() { diff --git a/src/d/actor/d_a_obj_lv5yiblltray.cpp b/src/d/actor/d_a_obj_lv5yiblltray.cpp index f0400aa04d..29af54398d 100644 --- a/src/d/actor/d_a_obj_lv5yiblltray.cpp +++ b/src/d/actor/d_a_obj_lv5yiblltray.cpp @@ -99,10 +99,12 @@ static dCcD_SrcCyl l_cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 90.0f, // mRadius - 200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 90.0f, // mRadius + 200.0f // mHeight + } // mCyl + } }; int daObjYIblltray_c::Create() { diff --git a/src/d/actor/d_a_obj_lv6ChangeGate.cpp b/src/d/actor/d_a_obj_lv6ChangeGate.cpp index d0ffff13f1..a28b3dca48 100644 --- a/src/d/actor/d_a_obj_lv6ChangeGate.cpp +++ b/src/d/actor/d_a_obj_lv6ChangeGate.cpp @@ -37,7 +37,9 @@ const dCcD_SrcGObjInf daLv6ChangeGate_c::mCcDObjInfo = { dCcD_SrcCyl daLv6ChangeGate_c::mCcDCyl = { mCcDObjInfo, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + } }; void daLv6ChangeGate_c::setBaseMtx() { diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp index c7ddba314e..316cd0e855 100644 --- a/src/d/actor/d_a_obj_lv6SwGate.cpp +++ b/src/d/actor/d_a_obj_lv6SwGate.cpp @@ -35,7 +35,16 @@ const dCcD_SrcGObjInf daLv6SwGate_c::mCcDObjInfo = { {0, {{0, 0, 0}, {0x400, 0x11}, {0x79}}}, {1, 0, 0, 0, 0}, {0xA, 0, 0, 0, 0}, {0} }; -dCcD_SrcCyl daLv6SwGate_c::mCcDCyl = {mCcDObjInfo}; +dCcD_SrcCyl daLv6SwGate_c::mCcDCyl = { + mCcDObjInfo, + { + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } // mCylAttr +}; static cull_box l_cull_box = {-1200.0f, -300.0f, -100.0f, 1200.0f, 300.0f, 100.0f}; diff --git a/src/d/actor/d_a_obj_lv6TogeTrap.cpp b/src/d/actor/d_a_obj_lv6TogeTrap.cpp index 71d741a290..9cd5e04f80 100644 --- a/src/d/actor/d_a_obj_lv6TogeTrap.cpp +++ b/src/d/actor/d_a_obj_lv6TogeTrap.cpp @@ -75,10 +75,12 @@ dCcD_SrcSph daLv6TogeTrap_c::mCcDSph = { dCcD_SrcCyl daLv6TogeTrap_c::mCcDCyl = { daLv6TogeTrap_c::mCcDObjInfo2, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static char* l_resNameIdx[3] = { diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index acb172e98a..90aa698e2b 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -165,10 +165,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 120.0f, // mRadius - 200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 120.0f, // mRadius + 200.0f // mHeight + } // mCyl + } }; int daObjLv6Bm_c::Create() { diff --git a/src/d/actor/d_a_obj_lv6egate.cpp b/src/d/actor/d_a_obj_lv6egate.cpp index 9b0e2029d5..0b9e4b3d93 100644 --- a/src/d/actor/d_a_obj_lv6egate.cpp +++ b/src/d/actor/d_a_obj_lv6egate.cpp @@ -48,10 +48,12 @@ static dCcD_SrcCyl l_at_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 300.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 300.0f // mHeight + } // mCyl + } }; int daObjLv6EGate_c::Create() { diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp index 6c861719f9..6d4b35cec5 100644 --- a/src/d/actor/d_a_obj_lv7bridge.cpp +++ b/src/d/actor/d_a_obj_lv7bridge.cpp @@ -120,10 +120,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 100.0f, // mRadius - 250.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 100.0f, // mRadius + 250.0f // mHeight + } // mCyl + } }; int daObjLv7Brg_c::Create() { diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index 1704dc2605..9c8082bb8f 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -93,10 +93,12 @@ void daObjMasterSword_c::initCollision() { {0}, // mGObjCo }, // mObjInf { - {current.pos.x, current.pos.y, current.pos.z}, // mCenter - 18.0f, // mRadius - 180.0f // mHeight - } // mCyl + { + {current.pos.x, current.pos.y, current.pos.z}, // mCenter + 18.0f, // mRadius + 180.0f // mHeight + } // mCyl + } }; mCcStts.Init(0xFF, 0xFF, this); diff --git a/src/d/actor/d_a_obj_mato.cpp b/src/d/actor/d_a_obj_mato.cpp index 8a5a431e6e..91788372f4 100644 --- a/src/d/actor/d_a_obj_mato.cpp +++ b/src/d/actor/d_a_obj_mato.cpp @@ -86,10 +86,12 @@ static dCcD_SrcCyl cc_cyl_src = { {2}, }, { - {0.0f, 0.0f, 0.0f}, - 150.0f, - 300.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 150.0f, + 300.0f, + }, + } }; } diff --git a/src/d/actor/d_a_obj_mie.cpp b/src/d/actor/d_a_obj_mie.cpp index c2e85e7290..099296a979 100644 --- a/src/d/actor/d_a_obj_mie.cpp +++ b/src/d/actor/d_a_obj_mie.cpp @@ -38,10 +38,12 @@ static dCcD_SrcGObjInf const l_ccDObjData = static dCcD_SrcCyl l_ccDCyl = { l_ccDObjData, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } // mCylAttr }; #if DEBUG diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index dccfd84bf3..e0794916f4 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -428,10 +428,12 @@ const dCcD_SrcCyl daObjMovebox::Act_c::M_cyl_src = { {0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 75.0f, // mRadius - 150.0f, // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 75.0f, // mRadius + 150.0f, // mHeight + } // mCyl + } }; // __declspec(section ".rodata") diff --git a/src/d/actor/d_a_obj_nagaisu.cpp b/src/d/actor/d_a_obj_nagaisu.cpp index 4eb368f552..0537544cf5 100644 --- a/src/d/actor/d_a_obj_nagaisu.cpp +++ b/src/d/actor/d_a_obj_nagaisu.cpp @@ -58,10 +58,12 @@ const dCcD_SrcCyl daObjIsuChild_c::s_CcDCyl = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 0.0f, - 0.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 0.0f, + 0.0f, + }, + } }; int daObjNagaisu_c::create() { diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index c0f2f3eb8f..b1f99c034e 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -39,14 +39,16 @@ void daObjOCTHASHI_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 400.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 400.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; if (l_cyl_height_init == 0) { - ccCylSrc.mCyl.mHeight = (f32)(mPieceNum + 1) * 800.0f - 100.f; + ccCylSrc.mCylAttr.mCyl.mHeight = (f32)(mPieceNum + 1) * 800.0f - 100.f; l_cyl_height_init = 1; } for (int idx = 0; idx < mPieceNum; ++idx) { diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp index 99639641d0..b21f980aff 100644 --- a/src/d/actor/d_a_obj_oiltubo.cpp +++ b/src/d/actor/d_a_obj_oiltubo.cpp @@ -18,10 +18,12 @@ static char* l_bbtkFileName = "x_oiltubo_00b.btk"; dCcD_SrcCyl daObj_Oiltubo_c::mCcDCyl = { daObj_Oiltubo_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daObj_Oiltubo_c::create() { diff --git a/src/d/actor/d_a_obj_onsenTaru.cpp b/src/d/actor/d_a_obj_onsenTaru.cpp index a8aef7325e..cc6f4dd16b 100644 --- a/src/d/actor/d_a_obj_onsenTaru.cpp +++ b/src/d/actor/d_a_obj_onsenTaru.cpp @@ -30,10 +30,12 @@ const dCcD_SrcGObjInf daOnsTaru_c::mCcDObjInfo = { dCcD_SrcCyl daOnsTaru_c::mCcDCyl = { daOnsTaru_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; void daOnsTaru_c::setBaseMtx() { diff --git a/src/d/actor/d_a_obj_pdtile.cpp b/src/d/actor/d_a_obj_pdtile.cpp index 911d9ac999..dde20c199e 100644 --- a/src/d/actor/d_a_obj_pdtile.cpp +++ b/src/d/actor/d_a_obj_pdtile.cpp @@ -193,10 +193,12 @@ static dCcD_SrcCyl cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 70.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 70.0f, // mRadius + 100.0f // mHeight + } // mCyl + } }; int daObjPDtile_c::Create() { diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp index 1fae189c54..35943067e0 100644 --- a/src/d/actor/d_a_obj_picture.cpp +++ b/src/d/actor/d_a_obj_picture.cpp @@ -540,10 +540,12 @@ dCcD_SrcCyl daObjPicture_c::s_CcDCyl_pic_at = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static actor_method_class daObjPicture_METHODS = { diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp index d991879540..80f0eb6dee 100644 --- a/src/d/actor/d_a_obj_pillar.cpp +++ b/src/d/actor/d_a_obj_pillar.cpp @@ -38,10 +38,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 75.0f, // mRadius - 500.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 75.0f, // mRadius + 500.0f // mHeight + } // mCyl + } }; #define SHAKE_DATA_CRASH_FIRST 0 diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp index 61346b493f..db62ad2fa3 100644 --- a/src/d/actor/d_a_obj_pumpkin.cpp +++ b/src/d/actor/d_a_obj_pumpkin.cpp @@ -154,10 +154,12 @@ static char* l_resNameList[2] = { static dCcD_SrcCyl l_ccDCyl = { l_ccDObjData, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static OBJ_PUMPKIN_HIO_CLASS l_HIO; diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp index 26ca7f138b..024b545284 100644 --- a/src/d/actor/d_a_obj_rgate.cpp +++ b/src/d/actor/d_a_obj_rgate.cpp @@ -80,10 +80,12 @@ static const dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 350.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 350.0f // mHeight + } // mCyl + } // mCylAttr }; void daObjRgate_c::initBaseMtx() { diff --git a/src/d/actor/d_a_obj_riverrock.cpp b/src/d/actor/d_a_obj_riverrock.cpp index 69bea987c6..23df94e990 100644 --- a/src/d/actor/d_a_obj_riverrock.cpp +++ b/src/d/actor/d_a_obj_riverrock.cpp @@ -27,10 +27,12 @@ void daObjRIVERROCK_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, -500.0f, 0.0f}, // mCenter - 1000.0f, // mRadius - 1000.0f // mHeight - } // mCyl + { + {0.0f, -500.0f, 0.0f}, // mCenter + 1000.0f, // mRadius + 1000.0f // mHeight + } // mCyl + } }; mStts.Init(0xff, 0xff, this); diff --git a/src/d/actor/d_a_obj_rotTrap.cpp b/src/d/actor/d_a_obj_rotTrap.cpp index bcd0f60079..72f7217102 100644 --- a/src/d/actor/d_a_obj_rotTrap.cpp +++ b/src/d/actor/d_a_obj_rotTrap.cpp @@ -28,7 +28,9 @@ dCcD_SrcGObjInf const daRotTrap_c::mCcDObjInfo = { dCcD_SrcCyl daRotTrap_c::mCcDCyl = { mCcDObjInfo, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + } }; static Vec atPos[] = { diff --git a/src/d/actor/d_a_obj_rw.cpp b/src/d/actor/d_a_obj_rw.cpp index eff67a34b7..52eb092e24 100644 --- a/src/d/actor/d_a_obj_rw.cpp +++ b/src/d/actor/d_a_obj_rw.cpp @@ -343,10 +343,12 @@ static int daOBJ_RW_Create(fopAc_ac_c* actor) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 200.0f, // mRadius - 250.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 200.0f, // mRadius + 250.0f // mHeight + } // mCyl + } }; i_this->ccStts.Init(0xFF, 0, actor); diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index 9815391dfa..95505cbfb0 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -21,10 +21,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 20.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 20.0f, // mRadius + 40.0f // mHeight + } // mCyl + } // mCylAttr }; static f32 Reflect(cXyz* pSpeed, cBgS_PolyInfo const& param_2, f32 param_3) { diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index 49953d0084..cc2614aba4 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -20,10 +20,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 20.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 20.0f, // mRadius + 40.0f // mHeight + } // mCyl + } }; static void* searchParentSub(void* i_actor, void* i_data) { diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index 68ae4dc357..02671f7c3a 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -987,10 +987,12 @@ static int daObj_So_Create(fopAc_ac_c* a_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 10.0f, // mRadius - 120.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 10.0f, // mRadius + 120.0f // mHeight + } // mCyl + } }; obj_so_class* i_this = (obj_so_class*)a_this; diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index 3d419b2e16..f5e8efc05f 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -99,10 +99,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 90.0f, // mRadius - 170.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 90.0f, // mRadius + 170.0f // mHeight + } // mCyl + } }; int daObjSwLight_c::Create() { diff --git a/src/d/actor/d_a_obj_swpropeller.cpp b/src/d/actor/d_a_obj_swpropeller.cpp index ea190d0ba2..5c4f1c6b4b 100644 --- a/src/d/actor/d_a_obj_swpropeller.cpp +++ b/src/d/actor/d_a_obj_swpropeller.cpp @@ -59,9 +59,11 @@ static const dCcD_SrcCyl l_cyl_src = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 100.0f, - 100.0f, + { + {0.0f, 0.0f, 0.0f}, + 100.0f, + 100.0f, + }, }, }; diff --git a/src/d/actor/d_a_obj_taFence.cpp b/src/d/actor/d_a_obj_taFence.cpp index 999c7b3122..2a58db6e0d 100644 --- a/src/d/actor/d_a_obj_taFence.cpp +++ b/src/d/actor/d_a_obj_taFence.cpp @@ -116,10 +116,12 @@ const dCcD_SrcGObjInf daTaFence_c::mCcDObjInfo = { dCcD_SrcCyl daTaFence_c::mCcDCyl = { daTaFence_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daTaFence_c::create() { diff --git a/src/d/actor/d_a_obj_tatigi.cpp b/src/d/actor/d_a_obj_tatigi.cpp index 5c19b7f286..5d91ed7e53 100644 --- a/src/d/actor/d_a_obj_tatigi.cpp +++ b/src/d/actor/d_a_obj_tatigi.cpp @@ -118,10 +118,12 @@ static int daObj_Tatigi_Create(fopAc_ac_c* a_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 35.0f, // mRadius - 120.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 35.0f, // mRadius + 120.0f // mHeight + } // mCyl + } }; obj_tatigi_class* i_this = (obj_tatigi_class*)a_this; diff --git a/src/d/actor/d_a_obj_thashi.cpp b/src/d/actor/d_a_obj_thashi.cpp index fe1d9d33d6..a702266dd4 100644 --- a/src/d/actor/d_a_obj_thashi.cpp +++ b/src/d/actor/d_a_obj_thashi.cpp @@ -35,10 +35,12 @@ void daObjTHASHI_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 110.f + nREG_F(17), // mRadius - 130.f + nREG_F(16) // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 110.f + nREG_F(17), // mRadius + 130.f + nREG_F(16) // mHeight + } // mCyl + } // mCylAttr }; unk13C8.Init(0xff, 0xff, this); unk1A58.Set(ccCylSrc); diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp index 5bb8d461e1..ec063f21cd 100644 --- a/src/d/actor/d_a_obj_thdoor.cpp +++ b/src/d/actor/d_a_obj_thdoor.cpp @@ -76,10 +76,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 37.5f, // mRadius - 250.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 37.5f, // mRadius + 250.0f // mHeight + } // mCyl + } }; int daObjThDoor_c::Create() { diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp index adef7a2c8b..fb3b050364 100644 --- a/src/d/actor/d_a_obj_togeTrap.cpp +++ b/src/d/actor/d_a_obj_togeTrap.cpp @@ -32,10 +32,12 @@ const dCcD_SrcGObjInf daTogeTrap_c::mCcDObjInfo = { dCcD_SrcCyl daTogeTrap_c::mCcDCyl = { daTogeTrap_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; void daTogeTrap_c::setBaseMtx() { diff --git a/src/d/actor/d_a_obj_tp.cpp b/src/d/actor/d_a_obj_tp.cpp index d23976dc5a..4a8eccd9da 100644 --- a/src/d/actor/d_a_obj_tp.cpp +++ b/src/d/actor/d_a_obj_tp.cpp @@ -316,10 +316,12 @@ static dCcD_SrcCyl cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 360.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 360.0f // mHeight + } // mCyl + } }; static int useHeapInit(fopAc_ac_c* i_this) { diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 7b5ee2f6af..1c239ff129 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -79,10 +79,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 350.0f, // mRadius - 1500.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 350.0f, // mRadius + 1500.0f // mHeight + } // mCyl + } }; int daObjVolcBom_c::Create() { diff --git a/src/d/actor/d_a_obj_waterfall.cpp b/src/d/actor/d_a_obj_waterfall.cpp index 9eb4abe824..2f12cacf8b 100644 --- a/src/d/actor/d_a_obj_waterfall.cpp +++ b/src/d/actor/d_a_obj_waterfall.cpp @@ -167,10 +167,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x2}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; cPhs__Step daObjWaterFall_c::Create() { diff --git a/src/d/actor/d_a_obj_web1.cpp b/src/d/actor/d_a_obj_web1.cpp index 5b28d3a5a2..23586b8825 100644 --- a/src/d/actor/d_a_obj_web1.cpp +++ b/src/d/actor/d_a_obj_web1.cpp @@ -250,10 +250,12 @@ static int daObj_Web1_Create(fopAc_ac_c* i_this) { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 50.0f, - 2.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 50.0f, + 2.0f, + }, + } }; int phase = dComIfG_resLoad(&_this->mPhase, "Obj_web1"); diff --git a/src/d/actor/d_a_obj_window.cpp b/src/d/actor/d_a_obj_window.cpp index 915abc25db..cad92fc8dc 100644 --- a/src/d/actor/d_a_obj_window.cpp +++ b/src/d/actor/d_a_obj_window.cpp @@ -21,10 +21,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 400.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 400.0f // mHeight + } // mCyl + } // mCylAttr }; void daObjWindow_c::initBaseMtx() { diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index bc69497739..cb28097ce8 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -45,10 +45,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 20.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 20.0f, // mRadius + 40.0f // mHeight + } // mCyl + } }; static char* l_arcName = "O_wood"; diff --git a/src/d/actor/d_a_obj_wsword.cpp b/src/d/actor/d_a_obj_wsword.cpp index 908074e456..97f9272470 100644 --- a/src/d/actor/d_a_obj_wsword.cpp +++ b/src/d/actor/d_a_obj_wsword.cpp @@ -19,10 +19,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 150.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 150.0f // mHeight + } // mCyl + } }; static int CheckCreateHeap(fopAc_ac_c* i_this) { diff --git a/src/d/actor/d_a_obj_yel_bag.cpp b/src/d/actor/d_a_obj_yel_bag.cpp index 67f6f1b15e..2d2d41a8b3 100644 --- a/src/d/actor/d_a_obj_yel_bag.cpp +++ b/src/d/actor/d_a_obj_yel_bag.cpp @@ -29,7 +29,9 @@ static char* l_resNames[] = {"yel_bag"}; dCcD_SrcCyl daObj_YBag_c::mCcDCyl = { daNpcT_c::mCcDObjData, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + } }; static u16 emttrId[4] = { diff --git a/src/d/actor/d_a_obj_yobikusa.cpp b/src/d/actor/d_a_obj_yobikusa.cpp index 1981d5aeaa..5cc08c8baa 100644 --- a/src/d/actor/d_a_obj_yobikusa.cpp +++ b/src/d/actor/d_a_obj_yobikusa.cpp @@ -212,10 +212,12 @@ const static dCcD_SrcCyl ccCylSrc = { {0x2}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 80.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 80.0f // mHeight + } // mCyl + } }; void daObjYobikusa_c::initCcCylinder() { diff --git a/src/d/actor/d_a_obj_zdoor.cpp b/src/d/actor/d_a_obj_zdoor.cpp index d612506c0c..9c57124eca 100644 --- a/src/d/actor/d_a_obj_zdoor.cpp +++ b/src/d/actor/d_a_obj_zdoor.cpp @@ -155,10 +155,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 35.0f, // mRadius - 400.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 35.0f, // mRadius + 400.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl l_cyl_src2 = { @@ -169,10 +171,12 @@ static dCcD_SrcCyl l_cyl_src2 = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 80.0f, // mRadius - 400.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 80.0f, // mRadius + 400.0f // mHeight + } // mCyl + } // mCylAttr }; void daZdoor_c::init_cyl() { diff --git a/src/d/actor/d_a_obj_zrTurara.cpp b/src/d/actor/d_a_obj_zrTurara.cpp index 63191c70cf..caa2a7e123 100644 --- a/src/d/actor/d_a_obj_zrTurara.cpp +++ b/src/d/actor/d_a_obj_zrTurara.cpp @@ -32,7 +32,9 @@ dCcD_SrcGObjInf const daZrTurara_c::mCcDObjInfo = { dCcD_SrcCyl daZrTurara_c::mCcDCyl = { mCcDObjInfo, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + } }; void daZrTurara_c::setBaseMtx() { diff --git a/src/d/actor/d_a_obj_zraMark.cpp b/src/d/actor/d_a_obj_zraMark.cpp index bf93888f74..1519380276 100644 --- a/src/d/actor/d_a_obj_zraMark.cpp +++ b/src/d/actor/d_a_obj_zraMark.cpp @@ -32,10 +32,12 @@ static const dCcD_SrcCyl l_sph_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f, // mHeight - } // mCylAttr + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f, // mHeight + } // mCylAttr + } }; static const int l_arcIdx[] = {3, 6, 5, 4}; diff --git a/src/d/actor/d_a_spinner.cpp b/src/d/actor/d_a_spinner.cpp index e0b3e7e0ff..26fee719d8 100644 --- a/src/d/actor/d_a_spinner.cpp +++ b/src/d/actor/d_a_spinner.cpp @@ -44,9 +44,11 @@ static dCcD_SrcCyl l_cylSrc = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 40.0f, - 85.0f, + { + {0.0f, 0.0f, 0.0f}, + 40.0f, + 85.0f, + } } }; diff --git a/src/d/actor/d_a_tag_attack_item.cpp b/src/d/actor/d_a_tag_attack_item.cpp index 8924b628f7..f3bfc4becb 100644 --- a/src/d/actor/d_a_tag_attack_item.cpp +++ b/src/d/actor/d_a_tag_attack_item.cpp @@ -17,10 +17,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 100.0f // mHeight + } // mCyl + } }; int daTagAtkItem_c::Create() { diff --git a/src/d/actor/d_a_tag_csw.cpp b/src/d/actor/d_a_tag_csw.cpp index baea03d037..5c461f3afc 100644 --- a/src/d/actor/d_a_tag_csw.cpp +++ b/src/d/actor/d_a_tag_csw.cpp @@ -22,10 +22,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 300.0f, // mRadius - 600.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 300.0f, // mRadius + 600.0f // mHeight + } // mCyl + } // mCylAttr }; #pragma pop @@ -39,10 +41,12 @@ static dCcD_SrcCyl l_tg_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 300.0f, // mRadius - 600.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 300.0f, // mRadius + 600.0f // mHeight + } // mCyl + } // mCylAttr }; #pragma pop diff --git a/src/d/actor/d_a_tag_pachi.cpp b/src/d/actor/d_a_tag_pachi.cpp index 530d796043..eaa18e2fd4 100644 --- a/src/d/actor/d_a_tag_pachi.cpp +++ b/src/d/actor/d_a_tag_pachi.cpp @@ -14,10 +14,12 @@ static dCcD_SrcCyl const l_sph_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daTagPati_c::create() { diff --git a/src/d/actor/d_a_tag_qs.cpp b/src/d/actor/d_a_tag_qs.cpp index 8061311d57..780e338a6e 100644 --- a/src/d/actor/d_a_tag_qs.cpp +++ b/src/d/actor/d_a_tag_qs.cpp @@ -21,10 +21,12 @@ static dCcD_SrcCyl l_cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 50.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 50.0f // mHeight + } // mCyl + } }; daTagQs_c::~daTagQs_c() {} diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index 62121c7c71..96955e7610 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -17,10 +17,12 @@ static dCcD_SrcCyl l_cylSrc = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 100.0f // mHeight + } // mCyl + } }; int daTagSppath_c::create() { diff --git a/src/d/actor/d_a_tag_yami.cpp b/src/d/actor/d_a_tag_yami.cpp index 7420bd48dc..edc1319f3a 100644 --- a/src/d/actor/d_a_tag_yami.cpp +++ b/src/d/actor/d_a_tag_yami.cpp @@ -17,10 +17,12 @@ const static dCcD_SrcCyl l_sph_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daTagYami_c::create() { diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index bb12fd1886..a0149a3d19 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -29,10 +29,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static daTbox_ModelInfo l_modelInfo[3] = { diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp index 06f0ac9aa4..d148a5343f 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -57,10 +57,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daTbox2_c::Create() { diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp index 5a76e1b4c0..cf09711b3e 100644 --- a/src/d/d_cc_d.cpp +++ b/src/d/d_cc_d.cpp @@ -4,6 +4,10 @@ #include "f_op/f_op_actor_mng.h" #include "f_pc/f_pc_searcher.h" +#if DEBUG +#include "d/d_debug_viewer.h" +#endif + void dCcD_GAtTgCoCommonBase::ClrActorInfo() { mApid = -1; mAc = NULL; @@ -51,7 +55,10 @@ void dCcD_GAtTgCoCommonBase::SubtractEffCounter() { } bool dCcD_GAtTgCoCommonBase::ChkEffCounter() { - return mEffCounter > 0; + if (mEffCounter > 0) { + return true; + } + return false; } dCcD_GStts::dCcD_GStts() { @@ -197,7 +204,11 @@ cCcD_GObjInf* dCcD_GObjInf::GetAtHitGObj() { } u8 dCcD_GObjInf::ChkAtNoGuard() { - return GetAtSpl() >= 12; + dCcG_At_Spl spl = GetAtSpl(); + if (spl >= 12) { + return 1; + } + return 0; } void dCcD_GObjInf::ClrTgHit() { @@ -313,8 +324,11 @@ void dCcD_GObjInf::Set(dCcD_SrcGObjInf const& src) { mGObjCo.Set(src.mGObjCo); } -dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* p_obj) { - return (dCcD_GObjInf*)p_obj->GetGObjInf(); +dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* pobj) { + JUT_ASSERT(687, pobj != NULL); + cCcD_GObjInf* cgobj = pobj->GetGObjInf(); + dCcD_GObjInf* dgobj = (dCcD_GObjInf*)cgobj; + return dgobj; } cCcD_ShapeAttr* dCcD_Pnt::GetShapeAttr() { @@ -340,17 +354,57 @@ void dCcD_Cps::CalcTgVec() { CalcVec(dest); } +#if DEBUG + +void dCcD_Cps::Draw(const GXColor& color) { + Mtx auStack_68; + Mtx auStack_98; + Mtx auStack_c8; + + MTXIdentity(auStack_68); + + cXyz cStack_d8; + CalcVec(&cStack_d8); + cMtx_trans(auStack_98, GetStartP().x, GetStartP().y, GetStartP().z); + cM3d_UpMtx(cStack_d8, auStack_c8); + cMtx_concat(auStack_98, auStack_c8, auStack_68); + cMtx_scale(auStack_98, GetR(), 0.5f * GetLen(), GetR()); + cMtx_concat(auStack_68, auStack_98, auStack_68); + cMtx_trans(auStack_98, 0.0f, 1.0f, 0.0f); + cMtx_concat(auStack_68, auStack_98, auStack_68); + cMtx_XrotS(auStack_98, 0x4000); + cMtx_concat(auStack_68, auStack_98, auStack_68); + dDbVw_drawCylinderMXlu(auStack_68, color, 1); + dDbVw_drawSphereXlu(GetStartP(), GetR(), color, 1); + dDbVw_drawSphereXlu(GetEndP(), GetR(), color, 1); +} + +#endif + void dCcD_Tri::Set(dCcD_SrcTri const& src) { dCcD_GObjInf::Set(src.mObjInf); + cCcD_TriAttr* attr = this; } cCcD_ShapeAttr* dCcD_Tri::GetShapeAttr() { return this; } +#if DEBUG + +void dCcD_Tri::Draw(const GXColor& color) { + cXyz cStack_34[3]; + cStack_34[0] = mA; + cStack_34[1] = mB; + cStack_34[2] = mC; + dDbVw_drawTriangleXlu(cStack_34, color, 1); +} + +#endif + void dCcD_Cyl::Set(dCcD_SrcCyl const& src) { dCcD_GObjInf::Set(src.mObjInf); - cCcD_CylAttr::Set(src.mCyl); + cCcD_CylAttr::Set(src.mCylAttr); } cCcD_ShapeAttr* dCcD_Cyl::GetShapeAttr() { @@ -365,18 +419,28 @@ void dCcD_Cyl::StartCAt(cXyz& pos) { void dCcD_Cyl::MoveCAt(cXyz& pos) { const cXyz* center = GetCP(); - cXyz diff = pos - *center; + cXyz diff; + diff = pos - *center; SetAtVec(diff); SetC(pos); } void dCcD_Cyl::MoveCTg(cXyz& pos) { const cXyz* center = GetCP(); - cXyz diff = pos - *center; + cXyz diff; + diff = pos - *center; SetTgVec(diff); SetC(pos); } +#if DEBUG + +void dCcD_Cyl::Draw(const GXColor& color) { + dDbVw_drawCylinderXlu(*GetCP(), GetR(), GetH(), color, 1); +} + +#endif + void dCcD_Sph::Set(dCcD_SrcSph const& src) { dCcD_GObjInf::Set(src.mObjInf); cCcD_SphAttr::Set(src.mSphAttr); @@ -390,7 +454,8 @@ void dCcD_Sph::StartCAt(cXyz& pos) { void dCcD_Sph::MoveCAt(cXyz& pos) { const cXyz* center = GetCP(); - cXyz diff = pos - *center; + cXyz diff; + diff = pos - *center; SetAtVec(diff); SetC(pos); } @@ -398,3 +463,11 @@ void dCcD_Sph::MoveCAt(cXyz& pos) { cCcD_ShapeAttr* dCcD_Sph::GetShapeAttr() { return this; } + +#if DEBUG + +void dCcD_Sph::Draw(const GXColor& color) { + dDbVw_drawSphereXlu(*GetCP(), GetR(), color, 1); +} + +#endif