summaryrefslogtreecommitdiff
path: root/include/SSystem
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2021-05-23 03:09:59 -0700
committerGitHub <noreply@github.com>2021-05-23 12:09:59 +0200
commite915df66c806bdff65aa243649f7abfe6cc19227 (patch)
tree226e708c0546c45f65420446382ba597ad773651 /include/SSystem
parent462d71cbef02ef119fc2aa480b98cfeedde46441 (diff)
move d_a_alink and some related stuff (#130)
* clean up d_a_player * move some of daalink * more daalink / daplayer * setup some daalink members * rest of daalink members setup * remove comment * few more matches * remove asm * more matches * more matches + move e_wb_class * fix some d_save classes Co-authored-by: lepelog <lepelog@users.noreply.github.com>
Diffstat (limited to 'include/SSystem')
-rw-r--r--include/SSystem/SComponent/c_bg_s_chk.h6
-rw-r--r--include/SSystem/SComponent/c_bg_s_gnd_chk.h8
-rw-r--r--include/SSystem/SComponent/c_bg_s_lin_chk.h15
-rw-r--r--include/SSystem/SComponent/c_m3d_g_pla.h1
-rw-r--r--include/SSystem/SComponent/c_m3d_g_sph.h2
5 files changed, 28 insertions, 4 deletions
diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h
index 2e379ef228..e544c3be4c 100644
--- a/include/SSystem/SComponent/c_bg_s_chk.h
+++ b/include/SSystem/SComponent/c_bg_s_chk.h
@@ -5,9 +5,9 @@
class cBgS_Chk {
private:
- /* 0x0 */ u32 unk_0x00;
- /* 0x4 */ u32 unk_0x04;
- /* 0x8 */ u32 unk_0x08;
+ /* 0x0 */ u32 mPolyPassChk;
+ /* 0x4 */ u32 mGrpPassChk;
+ /* 0x8 */ u32 mActorPid;
/* 0xC */ u8 unk_0x0C;
/* 0x10 */ // __vtable__
public:
diff --git a/include/SSystem/SComponent/c_bg_s_gnd_chk.h b/include/SSystem/SComponent/c_bg_s_gnd_chk.h
index 61531fd6b2..8b03e38b5e 100644
--- a/include/SSystem/SComponent/c_bg_s_gnd_chk.h
+++ b/include/SSystem/SComponent/c_bg_s_gnd_chk.h
@@ -2,12 +2,18 @@
#define C_BG_S_GND_CHK_H
#include "SSystem/SComponent/c_bg_s_chk.h"
+#include "SSystem/SComponent/c_bg_s_poly_info.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
class cBgS_GndChk : public cBgS_Chk {
private:
- // poly info
+ /* 0x14 */ cBgS_PolyInfo mPolyInfo;
+ /* 0x24 */ cXyz m_pos;
+ /* 0x30 */ int field_0x30;
+ /* 0x34 */ float mNowY;
+ /* 0x38 */ void* mWallPrecheck;
+
public:
cBgS_GndChk(void);
virtual ~cBgS_GndChk(void);
diff --git a/include/SSystem/SComponent/c_bg_s_lin_chk.h b/include/SSystem/SComponent/c_bg_s_lin_chk.h
index 8462b1c88d..60944d6b62 100644
--- a/include/SSystem/SComponent/c_bg_s_lin_chk.h
+++ b/include/SSystem/SComponent/c_bg_s_lin_chk.h
@@ -1,10 +1,25 @@
#ifndef C_BG_S_LIN_CHK_H
#define C_BG_S_LIN_CHK_H
+#include "SSystem/SComponent/c_bg_s_chk.h"
+#include "SSystem/SComponent/c_bg_s_poly_info.h"
+#include "SSystem/SComponent/c_m3d_g_lin.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
class cBgS_LinChk {
+private:
+ /* 0x000 */ cBgS_Chk mChk;
+ /* 0x014 */ cBgS_PolyInfo mPolyInfo;
+ /* 0x024 */ cM3dGLin mLin;
+ /* 0x040 */ cXyz field_0x40;
+ /* 0x04C */ int field_0x4c;
+ /* 0x050 */ u8 mPreWallChk;
+ /* 0x051 */ u8 mPreGroundChk;
+ /* 0x052 */ u8 mPreRoofChk;
+ /* 0x053 */ u8 mFrontFlag;
+ /* 0x054 */ u8 mBackFlag;
+
public:
cBgS_LinChk(void);
~cBgS_LinChk(void);
diff --git a/include/SSystem/SComponent/c_m3d_g_pla.h b/include/SSystem/SComponent/c_m3d_g_pla.h
index e72ece1ded..25f7cf8978 100644
--- a/include/SSystem/SComponent/c_m3d_g_pla.h
+++ b/include/SSystem/SComponent/c_m3d_g_pla.h
@@ -9,6 +9,7 @@ class cM3dGPla {
public:
cXyz mNormal;
f32 mD;
+ cM3dGPla();
cM3dGPla(const cXyz*, f32);
virtual ~cM3dGPla();
bool crossInfLin(const cXyz&, const cXyz&, cXyz&) const;
diff --git a/include/SSystem/SComponent/c_m3d_g_sph.h b/include/SSystem/SComponent/c_m3d_g_sph.h
index 5e8dce121b..e03e026fa4 100644
--- a/include/SSystem/SComponent/c_m3d_g_sph.h
+++ b/include/SSystem/SComponent/c_m3d_g_sph.h
@@ -16,6 +16,8 @@ public:
cXyz mCenter;
f32 mRadius;
+ virtual void test(); // temp to build OK, remove later
+ virtual ~cM3dGSph();
void SetC(const cXyz&);
void Set(const cXyz&, f32);
void Set(const cM3dGSphS&);