diff options
| author | Jcw87 <Jcw87@users.noreply.github.com> | 2023-05-12 12:10:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-12 12:10:14 -0700 |
| commit | 221f40e6097dfe76c76602aa21aa07d5f760dce4 (patch) | |
| tree | b8f2549712927365bcffd13688729555a4276ff1 /src/f_op | |
| parent | 8c7cda85891b41cfdbce72ed4efb00292f34a16a (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 'src/f_op')
| -rw-r--r-- | src/f_op/f_op_actor.cpp | 4 | ||||
| -rw-r--r-- | src/f_op/f_op_actor_mng.cpp | 14 | ||||
| -rw-r--r-- | src/f_op/f_op_actor_tag.cpp | 1 | ||||
| -rw-r--r-- | src/f_op/f_op_camera.cpp | 2 | ||||
| -rw-r--r-- | src/f_op/f_op_camera_mng.cpp | 1 | ||||
| -rw-r--r-- | src/f_op/f_op_draw_iter.cpp | 2 | ||||
| -rw-r--r-- | src/f_op/f_op_draw_tag.cpp | 2 | ||||
| -rw-r--r-- | src/f_op/f_op_kankyo.cpp | 2 | ||||
| -rw-r--r-- | src/f_op/f_op_msg.cpp | 2 | ||||
| -rw-r--r-- | src/f_op/f_op_msg_mng.cpp | 5 | ||||
| -rw-r--r-- | src/f_op/f_op_overlap.cpp | 1 | ||||
| -rw-r--r-- | src/f_op/f_op_overlap_mng.cpp | 1 | ||||
| -rw-r--r-- | src/f_op/f_op_overlap_req.cpp | 1 | ||||
| -rw-r--r-- | src/f_op/f_op_scene_pause.cpp | 1 | ||||
| -rw-r--r-- | src/f_op/f_op_scene_req.cpp | 2 | ||||
| -rw-r--r-- | src/f_op/f_op_scene_tag.cpp | 1 |
16 files changed, 36 insertions, 6 deletions
diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 27d1b92edd..ac22d565bd 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -4,12 +4,16 @@ */ #include "f_op/f_op_actor.h" +#include "d/a/d_a_alink.h" #include "d/com/d_com_inf_actor.h" #include "d/com/d_com_inf_game.h" #include "d/com/d_com_static.h" #include "d/d_demo.h" #include "d/s/d_s_play.h" +#include "f_op/f_op_actor_mng.h" #include "f_op/f_op_actor_tag.h" +#include "f_op/f_op_draw_tag.h" +#include "f_pc/f_pc_manager.h" /* 80018B64-80018BD0 0134A4 006C+00 0/0 7/7 562/562 .text __ct__10fopAc_ac_cFv */ fopAc_ac_c::fopAc_ac_c() {} diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 81347de663..112eea3aff 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -6,25 +6,27 @@ #include "f_op/f_op_actor_mng.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/J3DU/J3DUClipper.h" -#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" +#include "JSystem/JMath/JMath.h" #include "MSL_C/math.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_malloc.h" -#include "dol2asm.h" -#include "global.h" -#include "d/com/d_com_inf_game.h" -#include "JSystem/JMath/JMath.h" #include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_path.h" #include "d/d_procname.h" #include "d/d_stage.h" +#include "dol2asm.h" +#include "dolphin/os/OS.h" #include "f_op/f_op_actor.h" +#include "f_op/f_op_scene_mng.h" #include "global.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_lib.h" #include "m_Do/m_Do_mtx.h" #include "rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h" -#include "d/d_path.h" // // Types: diff --git a/src/f_op/f_op_actor_tag.cpp b/src/f_op/f_op_actor_tag.cpp index cd6740cd85..09e7a314ed 100644 --- a/src/f_op/f_op_actor_tag.cpp +++ b/src/f_op/f_op_actor_tag.cpp @@ -4,6 +4,7 @@ */ #include "f_op/f_op_actor_tag.h" +#include "SSystem/SComponent/c_list.h" /* ############################################################################################## */ /* 803A35E0-803A35F0 000700 000C+04 1/1 2/2 0/0 .data g_fopAcTg_Queue */ diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp index de0c7198b8..4a4d35f810 100644 --- a/src/f_op/f_op_camera.cpp +++ b/src/f_op/f_op_camera.cpp @@ -6,6 +6,8 @@ #include "f_op/f_op_camera.h" #include "d/com/d_com_inf_game.h" #include "d/s/d_s_play.h" +#include "f_op/f_op_draw_tag.h" +#include "f_pc/f_pc_manager.h" /* 8001E140-8001E180 018A80 0040+00 1/0 0/0 0/0 .text fopCam_Draw__FP12camera_class */ static s32 fopCam_Draw(camera_class* i_this) { diff --git a/src/f_op/f_op_camera_mng.cpp b/src/f_op/f_op_camera_mng.cpp index 4fa5fd5fd0..665d738d99 100644 --- a/src/f_op/f_op_camera_mng.cpp +++ b/src/f_op/f_op_camera_mng.cpp @@ -4,6 +4,7 @@ */ #include "f_op/f_op_camera_mng.h" +#include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_stdcreate_req.h" /* ############################################################################################## */ diff --git a/src/f_op/f_op_draw_iter.cpp b/src/f_op/f_op_draw_iter.cpp index c89473ab68..511f33ca66 100644 --- a/src/f_op/f_op_draw_iter.cpp +++ b/src/f_op/f_op_draw_iter.cpp @@ -4,6 +4,8 @@ */ #include "f_op/f_op_draw_iter.h" +#include "SSystem/SComponent/c_list.h" +#include "SSystem/SComponent/c_tag.h" #include "f_op/f_op_draw_tag.h" /* ############################################################################################## */ diff --git a/src/f_op/f_op_draw_tag.cpp b/src/f_op/f_op_draw_tag.cpp index 5daa1511d2..771624df35 100644 --- a/src/f_op/f_op_draw_tag.cpp +++ b/src/f_op/f_op_draw_tag.cpp @@ -4,6 +4,8 @@ */ #include "f_op/f_op_draw_tag.h" +#include "SSystem/SComponent/c_list.h" +#include "SSystem/SComponent/c_tag.h" #include "global.h" /* ############################################################################################## */ diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index ac3dbc0cdf..38ba80921e 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -7,6 +7,8 @@ #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" #include "d/s/d_s_play.h" +#include "f_op/f_op_draw_tag.h" +#include "f_op/f_op_kankyo_mng.h" #include "f_pc/f_pc_manager.h" /* 8001F284-8001F2C0 019BC4 003C+00 1/0 0/0 0/0 .text fopKy_Draw__FPv */ diff --git a/src/f_op/f_op_msg.cpp b/src/f_op/f_op_msg.cpp index b9b30830ff..a7f9e18752 100644 --- a/src/f_op/f_op_msg.cpp +++ b/src/f_op/f_op_msg.cpp @@ -5,7 +5,9 @@ #include "f_op/f_op_msg.h" #include "d/s/d_s_play.h" +#include "f_op/f_op_draw_tag.h" #include "f_op/f_op_msg_mng.h" +#include "f_pc/f_pc_manager.h" /* 8001F488-8001F4B0 019DC8 0028+00 1/0 0/0 0/0 .text fopMsg_Draw__FPv */ static int fopMsg_Draw(void* i_this) { diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 09e1786306..efceab4ca1 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -5,13 +5,18 @@ #include "f_op/f_op_msg_mng.h" #include "JSystem/J2DGraph/J2DPane.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JMath/JMath.h" #include "SSystem/SComponent/c_malloc.h" #include "SSystem/SComponent/c_math.h" #include "d/com/d_com_inf_game.h" +#include "d/meter/d_meter2.h" +#include "d/meter/d_meter2_info.h" #include "d/msg/d_msg_object.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_scene_mng.h" +#include "global.h" // // Forward References: diff --git a/src/f_op/f_op_overlap.cpp b/src/f_op/f_op_overlap.cpp index 5600eb1aa0..0eb284f10a 100644 --- a/src/f_op/f_op_overlap.cpp +++ b/src/f_op/f_op_overlap.cpp @@ -3,6 +3,7 @@ * Overlap Process Framework */ +#include "SSystem/SComponent/c_request.h" #include "f_op/f_op_overlap.h" #include "f_op/f_op_overlap_mng.h" #include "f_pc/f_pc_manager.h" diff --git a/src/f_op/f_op_overlap_mng.cpp b/src/f_op/f_op_overlap_mng.cpp index 6f7de58896..79a1a6e0fe 100644 --- a/src/f_op/f_op_overlap_mng.cpp +++ b/src/f_op/f_op_overlap_mng.cpp @@ -3,6 +3,7 @@ * Overlap Process Manager */ +#include "SSystem/SComponent/c_request.h" #include "f_op/f_op_overlap_mng.h" #include "f_op/f_op_overlap_req.h" #include "f_op/f_op_scene_pause.h" diff --git a/src/f_op/f_op_overlap_req.cpp b/src/f_op/f_op_overlap_req.cpp index 8d6622ab4d..3952ae029c 100644 --- a/src/f_op/f_op_overlap_req.cpp +++ b/src/f_op/f_op_overlap_req.cpp @@ -3,6 +3,7 @@ * Overlap Process Request */ +#include "SSystem/SComponent/c_request.h" #include "f_op/f_op_overlap_req.h" #include "f_pc/f_pc_executor.h" #include "f_pc/f_pc_manager.h" diff --git a/src/f_op/f_op_scene_pause.cpp b/src/f_op/f_op_scene_pause.cpp index 5ae68c389a..0d2a7df7f4 100644 --- a/src/f_op/f_op_scene_pause.cpp +++ b/src/f_op/f_op_scene_pause.cpp @@ -4,6 +4,7 @@ */ #include "f_op/f_op_scene_pause.h" +#include "f_op/f_op_scene.h" #include "f_pc/f_pc_executor.h" #include "f_pc/f_pc_manager.h" diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp index 3831a62dd9..2c727692ae 100644 --- a/src/f_op/f_op_scene_req.cpp +++ b/src/f_op/f_op_scene_req.cpp @@ -5,6 +5,8 @@ #include "f_op/f_op_scene_req.h" #include "f_op/f_op_overlap_mng.h" +#include "f_op/f_op_scene.h" +#include "f_op/f_op_scene_pause.h" #include "f_pc/f_pc_executor.h" /* 8001EE34-8001EE64 019774 0030+00 1/0 0/0 0/0 .text diff --git a/src/f_op/f_op_scene_tag.cpp b/src/f_op/f_op_scene_tag.cpp index 56021f060b..6aa5e75be0 100644 --- a/src/f_op/f_op_scene_tag.cpp +++ b/src/f_op/f_op_scene_tag.cpp @@ -3,6 +3,7 @@ * Scene Process Tag */ +#include "SSystem/SComponent/c_tag.h" #include "f_op/f_op_scene_tag.h" /* 8001F13C-8001F15C 019A7C 0020+00 0/0 1/1 0/0 .text fopScnTg_QueueTo__FP15scene_tag_class */ |
