summaryrefslogtreecommitdiff
path: root/include/SSystem/SComponent
diff options
context:
space:
mode:
authorPheenoh <pheenoh@gmail.com>2024-04-12 00:10:30 -0600
committerGitHub <noreply@github.com>2024-04-12 00:10:30 -0600
commita61e3491f7c46b698514af50464cf71ba76bd3a3 (patch)
tree40dbf46b97316a5a6d919e35c9976506df869000 /include/SSystem/SComponent
parentb36f0f93660b0b1eee5268acad6c1b7b60f0bb5d (diff)
d_a_e_fz work, doxygen revamp (#2127)
* initial freezard actor struct + setActionMode OK * daE_FZ_Draw * setReflectAngle * mBoundSoundset * daE_FZ_Execute & execute * demoDelete * daE_FZ_Delete & _delete * CreateHeap * useHeapInit * cc_set * mtx_set * action WIP * way_gake_check * executeRollMove * executeMove * draw WIP * executeDamage * checkpoint * create * checkpoint * daE_FZ_c::executeWait * checkpoint * daE_FZ_c::damage_check almost done * rm asm * rm headers * setup_profile WIP + doxygen update * fix merge issues * docs fix? * fix2 * doxygen updates * setup g_profile_E_FZ, profile setup script WIP * update github actions * update progress.md
Diffstat (limited to 'include/SSystem/SComponent')
-rw-r--r--include/SSystem/SComponent/c_bg_s_lin_chk.h1
-rw-r--r--include/SSystem/SComponent/c_bg_s_shdw_draw.h1
-rw-r--r--include/SSystem/SComponent/c_cc_d.h2
-rw-r--r--include/SSystem/SComponent/c_cc_s.h1
-rw-r--r--include/SSystem/SComponent/c_m2d.h1
-rw-r--r--include/SSystem/SComponent/c_m3d.h1
-rw-r--r--include/SSystem/SComponent/c_m3d_g_aab.h1
-rw-r--r--include/SSystem/SComponent/c_m3d_g_cps.h1
-rw-r--r--include/SSystem/SComponent/c_m3d_g_tri.h1
9 files changed, 2 insertions, 8 deletions
diff --git a/include/SSystem/SComponent/c_bg_s_lin_chk.h b/include/SSystem/SComponent/c_bg_s_lin_chk.h
index 3566c54455..72595bc2b4 100644
--- a/include/SSystem/SComponent/c_bg_s_lin_chk.h
+++ b/include/SSystem/SComponent/c_bg_s_lin_chk.h
@@ -4,7 +4,6 @@
#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 "dolphin/types.h"
class cBgS_LinChk : public cBgS_Chk, public cBgS_PolyInfo {
public:
diff --git a/include/SSystem/SComponent/c_bg_s_shdw_draw.h b/include/SSystem/SComponent/c_bg_s_shdw_draw.h
index 806d7cf5d3..e99a933b70 100644
--- a/include/SSystem/SComponent/c_bg_s_shdw_draw.h
+++ b/include/SSystem/SComponent/c_bg_s_shdw_draw.h
@@ -3,7 +3,6 @@
#include "SSystem/SComponent/c_bg_s_chk.h"
#include "SSystem/SComponent/c_m3d_g_aab.h"
-#include "dolphin/types.h"
struct cBgD_Vtx_t;
class cM3dGPla;
diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h
index 9d24922489..64381d1c21 100644
--- a/include/SSystem/SComponent/c_cc_d.h
+++ b/include/SSystem/SComponent/c_cc_d.h
@@ -26,6 +26,8 @@ class cCcD_CylAttr;
class cCcD_SphAttr;
enum cCcD_ObjAtType {
+ /* 0x00000000 */ AT_TYPE_0 = 0,
+ /* 0x00000001*/ AT_TYPE_1 = (1 << 0),
/* 0x00000002 */ AT_TYPE_NORMAL_SWORD = (1 << 1), // wooden or ordon
/* 0x00000004 */ AT_TYPE_HORSE = (1 << 2),
/* 0x00000008 */ AT_TYPE_THROW_OBJ = (1 << 3),
diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h
index b1b902e733..09899b8a23 100644
--- a/include/SSystem/SComponent/c_cc_s.h
+++ b/include/SSystem/SComponent/c_cc_s.h
@@ -2,7 +2,6 @@
#define C_CC_S_H
#include "SSystem/SComponent/c_cc_d.h"
-#include "global.h"
enum WeightType {
WeightType_0 = 0,
diff --git a/include/SSystem/SComponent/c_m2d.h b/include/SSystem/SComponent/c_m2d.h
index 9e90110960..f6fe537a76 100644
--- a/include/SSystem/SComponent/c_m2d.h
+++ b/include/SSystem/SComponent/c_m2d.h
@@ -1,7 +1,6 @@
#ifndef C_M2D_H
#define C_M2D_H
-#include "dolphin/types.h"
struct cM2dGCir;
diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h
index cc4076df3c..e68ed1e2a8 100644
--- a/include/SSystem/SComponent/c_m3d.h
+++ b/include/SSystem/SComponent/c_m3d.h
@@ -2,7 +2,6 @@
#define C_M3D_H_
#include "math.h"
-#include "dolphin/types.h"
#include "dolphin/mtx/vec.h"
class cM3dGAab;
diff --git a/include/SSystem/SComponent/c_m3d_g_aab.h b/include/SSystem/SComponent/c_m3d_g_aab.h
index 2e60d72ce6..759f2b6402 100644
--- a/include/SSystem/SComponent/c_m3d_g_aab.h
+++ b/include/SSystem/SComponent/c_m3d_g_aab.h
@@ -1,7 +1,6 @@
#ifndef C_M3D_G_AAB_H
#define C_M3D_G_AAB_H
-#include "SSystem/SComponent/c_xyz.h"
#include "SSystem/SComponent/c_m3d_g_lin.h"
#include "SSystem/SComponent/c_m3d.h"
#include "global.h"
diff --git a/include/SSystem/SComponent/c_m3d_g_cps.h b/include/SSystem/SComponent/c_m3d_g_cps.h
index d2f7240858..5147e02114 100644
--- a/include/SSystem/SComponent/c_m3d_g_cps.h
+++ b/include/SSystem/SComponent/c_m3d_g_cps.h
@@ -3,7 +3,6 @@
#include "SSystem/SComponent/c_m3d.h"
#include "SSystem/SComponent/c_m3d_g_lin.h"
-#include "global.h"
struct cM3dGCpsS {
/* 0x00 */ Vec mStart;
diff --git a/include/SSystem/SComponent/c_m3d_g_tri.h b/include/SSystem/SComponent/c_m3d_g_tri.h
index f940500880..72d0b11472 100644
--- a/include/SSystem/SComponent/c_m3d_g_tri.h
+++ b/include/SSystem/SComponent/c_m3d_g_tri.h
@@ -2,7 +2,6 @@
#define C_M3D_G_TRI_H_
#include "SSystem/SComponent/c_m3d_g_pla.h"
-#include "dolphin/types.h"
class cM3dGCyl;