From a8a159ae2c18e2ce3c0f98b1cc54e36ed14cff60 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Mon, 8 Jan 2024 12:10:05 +0200 Subject: Various Matches, J2DTextBoxEx and J2DTevs OK (#2025) * Work on src/d/bg * misc work * J2dTextBoxEx OK * J2DTevs OK * Better return values for bool --- include/SSystem/SComponent/c_bg_s_chk.h | 2 +- include/SSystem/SComponent/c_bg_s_lin_chk.h | 1 + include/SSystem/SComponent/c_m3d_g_cps.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'include/SSystem/SComponent') diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h index eacef20b80..5e3eeb7d0b 100644 --- a/include/SSystem/SComponent/c_bg_s_chk.h +++ b/include/SSystem/SComponent/c_bg_s_chk.h @@ -7,7 +7,7 @@ struct cBgD_Vtx_t : public Vec {}; class cBgS_GrpPassChk { public: - virtual ~cBgS_GrpPassChk(); + virtual ~cBgS_GrpPassChk() {} }; class cBgS_PolyPassChk; diff --git a/include/SSystem/SComponent/c_bg_s_lin_chk.h b/include/SSystem/SComponent/c_bg_s_lin_chk.h index e0ae77d96c..ff8f28acfe 100644 --- a/include/SSystem/SComponent/c_bg_s_lin_chk.h +++ b/include/SSystem/SComponent/c_bg_s_lin_chk.h @@ -38,6 +38,7 @@ public: bool GetPreWallChk() const { return mPreWallChk; } bool GetPreGroundChk() const { return mPreGroundChk; } bool GetPreRoofChk() const { return mPreRoofChk; } + cXyz* GetStartP() { return &mLin.GetStartP(); } }; #endif /* C_BG_S_LIN_CHK_H */ diff --git a/include/SSystem/SComponent/c_m3d_g_cps.h b/include/SSystem/SComponent/c_m3d_g_cps.h index 40d6e6a4fb..d2f7240858 100644 --- a/include/SSystem/SComponent/c_m3d_g_cps.h +++ b/include/SSystem/SComponent/c_m3d_g_cps.h @@ -26,6 +26,7 @@ public: bool Cross(cM3dGCyl const* cyl, cXyz* xyz) const { return cM3d_Cross_CpsCyl(*this, *cyl, xyz); } bool Cross(cM3dGSph const* sph, cXyz* xyz) const { return cM3d_Cross_CpsSph(*this, *sph, xyz); } void SetR(f32 r) { mRadius = r; } + f32 GetR() const { return mRadius; } }; // Size = 0x20 -- cgit v1.2.3