From 3a79e96e8b033e26a3970da68d0633010fac0f03 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sun, 6 Feb 2022 06:23:54 -0800 Subject: d_meter2 wip / d_s_play / d_file_sel_info (#179) * d_meter2 wip * d_s_play * d_file_sel_info * format * tag_lv5soup / tag_setBall / fix dKyeff * d_cc_uty --- include/SSystem/SComponent/c_bg_s_lin_chk.h | 1 + include/SSystem/SComponent/c_cc_d.h | 2 ++ include/SSystem/SComponent/c_counter.h | 12 ++++++++++++ include/SSystem/SComponent/c_m3d_g_pla.h | 1 + 4 files changed, 16 insertions(+) (limited to 'include/SSystem/SComponent') diff --git a/include/SSystem/SComponent/c_bg_s_lin_chk.h b/include/SSystem/SComponent/c_bg_s_lin_chk.h index 2db857959e..cfd9692cdf 100644 --- a/include/SSystem/SComponent/c_bg_s_lin_chk.h +++ b/include/SSystem/SComponent/c_bg_s_lin_chk.h @@ -23,6 +23,7 @@ public: void ct(); void Set2(const cXyz*, const cXyz*, unsigned int); void PreCalc(); + void GetCross(); virtual ~cBgS_LinChk(); diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 1bc91d70f0..27b3df6205 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -24,6 +24,8 @@ public: /* 0x1C vtable */ struct Shape { + /* 80167BBC */ ~Shape(); + /* 0x00 */ u32 _0; /* 0x04 */ f32 _4; /* 0x08 */ f32 _8; diff --git a/include/SSystem/SComponent/c_counter.h b/include/SSystem/SComponent/c_counter.h index 6a8d25c002..6967d2a678 100644 --- a/include/SSystem/SComponent/c_counter.h +++ b/include/SSystem/SComponent/c_counter.h @@ -3,6 +3,18 @@ #include "dolphin/types.h" +struct counter_class { + s32 mCounter0; + s32 mCounter1; + s32 mTimer; +}; + +extern counter_class g_Counter; + void cCt_Counter(int resetCounter1); +inline void cCt_execCounter() { + g_Counter.mTimer++; +} + #endif /* C_COUNTER_H */ diff --git a/include/SSystem/SComponent/c_m3d_g_pla.h b/include/SSystem/SComponent/c_m3d_g_pla.h index 178f57ba7b..387f074d5d 100644 --- a/include/SSystem/SComponent/c_m3d_g_pla.h +++ b/include/SSystem/SComponent/c_m3d_g_pla.h @@ -20,6 +20,7 @@ public: void Set(const cM3dGPla*); f32 getPlaneFunc(const Vec* pPoint) const { return mD + PSVECDotProduct(&mNormal, pPoint); } const cXyz& GetNP() const { return mNormal; } + void GetNP(); f32 GetD() const { return mD; } }; -- cgit v1.2.3