summaryrefslogtreecommitdiff
path: root/include/d/a
diff options
context:
space:
mode:
authorJcw87 <Jcw87@users.noreply.github.com>2023-05-12 12:10:14 -0700
committerGitHub <noreply@github.com>2023-05-12 12:10:14 -0700
commit221f40e6097dfe76c76602aa21aa07d5f760dce4 (patch)
treeb8f2549712927365bcffd13688729555a4276ff1 /include/d/a
parent8c7cda85891b41cfdbce72ed4efb00292f34a16a (diff)
Remove #includes from headers (#334)
* add "global.h" to files that use it * add MSL_C includes to files that use them * remove dolphin includes from headers that don't need them * remove JSupport includes from headers that don't need them * remove JKernel includes from headers that don't need them * remove JUtility includes from headers that don't need them * remove J3D includes from headers that don't need them * remove J2D includes from headers that don't need them * remove JAudio2 includes from headers that don't need them * remove Z2AudioLib includes from headers that don't need them * remove JMessage includes from headers that don't need them * remove JParticle includes from headers that don't need them * remove SComponent includes from headers that don't need them * remove dol includes from headers that don't need them * sort includes
Diffstat (limited to 'include/d/a')
-rw-r--r--include/d/a/d_a_alink.h23
-rw-r--r--include/d/a/d_a_horse_static.h2
-rw-r--r--include/d/a/d_a_item_static.h3
-rw-r--r--include/d/a/d_a_itembase_static.h3
-rw-r--r--include/d/a/d_a_npc.h5
-rw-r--r--include/d/a/d_a_obj_ss_base.h2
-rw-r--r--include/d/a/d_a_player.h8
7 files changed, 25 insertions, 21 deletions
diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h
index d05a1591c6..f918ad216a 100644
--- a/include/d/a/d_a_alink.h
+++ b/include/d/a/d_a_alink.h
@@ -3,35 +3,38 @@
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
#include "JSystem/J3DGraphBase/J3DMatBlock.h"
+#include "JSystem/JParticle/JPAParticle.h"
#include "Z2AudioLib/Z2Creature.h"
#include "Z2AudioLib/Z2WolfHowlMgr.h"
#include "d/a/d_a_player.h"
-#include "d/bg/d_bg_s.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/bg/d_bg_s_lin_chk.h"
+#include "d/bg/d_bg_w_base.h"
#include "d/cc/d_cc_d.h"
-#include "d/cc/d_cc_mass_s.h"
#include "d/d_attention.h"
-#include "d/d_drawlist.h"
#include "d/d_eye_hl.h"
#include "d/d_jnt_col.h"
-#include "d/kankyo/d_kankyo.h"
#include "d/meter/d_meter2_info.h"
#include "d/msg/d_msg_flow.h"
#include "d/particle/d_particle.h"
#include "d/particle/d_particle_copoly.h"
+#include "d/save/d_save.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
-#include "f_op/f_op_scene.h"
+#include "global.h"
#include "rel/d/a/kytag/d_a_kytag05/d_a_kytag05.h"
#include "rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h"
-class fopEn_enemy_c;
-class daAlinkHIO_anm_c;
-class J3DAnmTevRegKey;
-class dDemo_actor_c;
-class daScex_c;
+class J2DAnmColorKey;
+class J2DAnmTransformKey;
class J2DScreen;
class J2DPane;
class J2DAnmBase;
+class J3DAnmTevRegKey;
+class dDemo_actor_c;
+class daAlinkHIO_anm_c;
+class daScex_c;
+class fopEn_enemy_c;
class daAlink_lockCursor_c : public dDlst_base_c {
public:
diff --git a/include/d/a/d_a_horse_static.h b/include/d/a/d_a_horse_static.h
index d2b4f4223b..a9918b7af2 100644
--- a/include/d/a/d_a_horse_static.h
+++ b/include/d/a/d_a_horse_static.h
@@ -2,7 +2,7 @@
#define D_A_D_A_HORSE_STATIC_H
#include "dolphin/types.h"
-#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h"
+#include "f_op/f_op_actor.h"
class daTagHstop_c : public fopAc_ac_c {
public:
diff --git a/include/d/a/d_a_item_static.h b/include/d/a/d_a_item_static.h
index 16b521d874..9a19d3e2e1 100644
--- a/include/d/a/d_a_item_static.h
+++ b/include/d/a/d_a_item_static.h
@@ -2,9 +2,10 @@
#define D_A_D_A_ITEM_STATIC_H
#include "SSystem/SComponent/c_lib.h"
+#include "Z2AudioLib/Z2SoundObject.h"
#include "dolphin/types.h"
#include "d/a/d_a_itembase.h"
-#include "d/a/d_a_itembase_static.h"
+#include "d/cc/d_cc_d.h"
#include "d/particle/d_particle.h"
class daItem_c;
diff --git a/include/d/a/d_a_itembase_static.h b/include/d/a/d_a_itembase_static.h
index 3c7f96b55d..d44917a789 100644
--- a/include/d/a/d_a_itembase_static.h
+++ b/include/d/a/d_a_itembase_static.h
@@ -1,9 +1,10 @@
#ifndef D_A_D_A_ITEMBASE_STATIC_H
#define D_A_D_A_ITEMBASE_STATIC_H
-#include "d/a/d_a_itembase.h"
#include "dolphin/types.h"
+class fopAc_ac_c;
+
void CheckFieldItemCreateHeap(fopAc_ac_c* actor);
#endif /* D_A_D_A_ITEMBASE_STATIC_H */
diff --git a/include/d/a/d_a_npc.h b/include/d/a/d_a_npc.h
index a904b9e7b7..40620561ef 100644
--- a/include/d/a/d_a_npc.h
+++ b/include/d/a/d_a_npc.h
@@ -1,9 +1,12 @@
#ifndef D_A_D_A_NPC_H
#define D_A_D_A_NPC_H
+#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
+#include "Z2AudioLib/Z2Creature.h"
#include "d/com/d_com_inf_game.h"
#include "d/d_path.h"
-#include "d/msg/d_msg_object.h"
+#include "d/msg/d_msg_flow.h"
+#include "d/particle/d_particle_copoly.h"
#include "dolphin/types.h"
#include "global.h"
diff --git a/include/d/a/d_a_obj_ss_base.h b/include/d/a/d_a_obj_ss_base.h
index 29bf74248a..2c25613874 100644
--- a/include/d/a/d_a_obj_ss_base.h
+++ b/include/d/a/d_a_obj_ss_base.h
@@ -1,7 +1,7 @@
#ifndef A_OBJ_D_A_OBJ_SS_BASE_H
#define A_OBJ_D_A_OBJ_SS_BASE_H
-#include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_actor.h"
class daObj_SSBase_c : public fopAc_ac_c {
public:
diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index 34b0ea5b88..ede65e9781 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -1,16 +1,12 @@
#ifndef D_A_D_A_PLAYER_H
#define D_A_D_A_PLAYER_H
-#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
-#include "JSystem/JUtility/JUTTexture.h"
-#include "SSystem/SComponent/c_bg_s_poly_info.h"
#include "d/d_drawlist.h"
-#include "d/d_resorce.h"
-#include "d/d_stage.h"
-#include "d/save/d_save.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
+struct ResTIMG;
+
class daPy_sightPacket_c : public dDlst_base_c {
public:
daPy_sightPacket_c() {}