From 877889c5105e59ee3aa4e57e53d3b0c5ffcfca77 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Tue, 23 Dec 2025 18:53:10 -0500 Subject: Clean up code, remove fakematches, add UNUSED, enable warnings (#2992) * Remove NDEBUG_DEFINED fakematch, clean up getName temps * Fix ifdef * Fix bad JSystem pch ifdef breaking decomp.me * Remove Acch Chk fakematches * Private Acch fields * Fix some clangd errors in headers * Add UNUSED macro for matching debug parameters * Enable clangd unused-parameter warning * Remove extern from initializers Probably added by dol2asm? * Fix process profile definitions * Remove leftover dol2asm address comments * Remove some unnecessary double casts * Enable some more clangd warnings * Fix missing usages of fopAcM_ct * Fix wrong enum usage * Fix more fakematches --- include/SSystem/SComponent/c_cc_d.h | 36 ++++++++++++++++++------------------ include/SSystem/SComponent/c_cc_s.h | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'include/SSystem') diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index f8802dfc25..0ad2f717a7 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -403,24 +403,24 @@ public: virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const { return false; } - /* vt[4] */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const = 0; - /* vt[5] */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const = 0; - /* vt[6] */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const = 0; - /* vt[7] */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const = 0; - /* vt[8] */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const = 0; - /* vt[9] */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const = 0; - /* 802649E0 vt[10]*/ virtual bool CrossCo(cCcD_ShapeAttr const&, f32*) const { return false; } - /* vt[11]*/ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const = 0; - /* vt[12]*/ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const = 0; - /* vt[13]*/ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const = 0; - /* vt[14]*/ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const = 0; - /* vt[15]*/ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const = 0; - /* vt[16]*/ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const = 0; - /* 80084E38 vt[17]*/ virtual const cXyz& GetCoCP() const { return m_virtual_center; } - /* 80084E2C vt[18]*/ virtual cXyz& GetCoCP() { return m_virtual_center; } - /* vt[19]*/ virtual void CalcAabBox() = 0; - /* vt[20]*/ virtual bool GetNVec(cXyz const&, cXyz*) const = 0; - /* 80263A64 vt[21]*/ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const; + /* vt[4] */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const = 0; + /* vt[5] */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const = 0; + /* vt[6] */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const = 0; + /* vt[7] */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const = 0; + /* vt[8] */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const = 0; + /* vt[9] */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const = 0; + /* vt[10]*/ virtual bool CrossCo(cCcD_ShapeAttr const&, f32*) const { return false; } + /* vt[11]*/ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const = 0; + /* vt[12]*/ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const = 0; + /* vt[13]*/ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const = 0; + /* vt[14]*/ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const = 0; + /* vt[15]*/ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const = 0; + /* vt[16]*/ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const = 0; + /* vt[17]*/ virtual const cXyz& GetCoCP() const { return m_virtual_center; } + /* vt[18]*/ virtual cXyz& GetCoCP() { return m_virtual_center; } + /* vt[19]*/ virtual void CalcAabBox() = 0; + /* vt[20]*/ virtual bool GetNVec(cXyz const&, cXyz*) const = 0; + /* vt[21]*/ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const; cM3dGAab& GetWorkAab() { return mAab; } cM3dGAab const& GetWorkAab() const { return mAab; } diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h index b82cd29a33..334f7351d8 100644 --- a/include/SSystem/SComponent/c_cc_s.h +++ b/include/SSystem/SComponent/c_cc_s.h @@ -46,7 +46,7 @@ public: virtual void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*); void SetAtTgCommonHitInf(cCcD_Obj*, cCcD_Obj*, cXyz*); void SetCoCommonHitInf(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32); - /* 80265750 vt[3]*/ virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32); + /* vt[3]*/ virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32); void CalcArea(); void Move(); void DrawClear(); -- cgit v1.2.3