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_pc | |
| 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_pc')
| -rw-r--r-- | src/f_pc/f_pc_base.cpp | 3 | ||||
| -rw-r--r-- | src/f_pc/f_pc_create_iter.cpp | 3 | ||||
| -rw-r--r-- | src/f_pc/f_pc_create_req.cpp | 2 | ||||
| -rw-r--r-- | src/f_pc/f_pc_delete_tag.cpp | 2 | ||||
| -rw-r--r-- | src/f_pc/f_pc_draw.cpp | 1 | ||||
| -rw-r--r-- | src/f_pc/f_pc_fstcreate_req.cpp | 2 | ||||
| -rw-r--r-- | src/f_pc/f_pc_layer_iter.cpp | 1 | ||||
| -rw-r--r-- | src/f_pc/f_pc_layer_tag.cpp | 1 | ||||
| -rw-r--r-- | src/f_pc/f_pc_line.cpp | 3 | ||||
| -rw-r--r-- | src/f_pc/f_pc_manager.cpp | 2 | ||||
| -rw-r--r-- | src/f_pc/f_pc_method_iter.cpp | 1 | ||||
| -rw-r--r-- | src/f_pc/f_pc_node_req.cpp | 1 | ||||
| -rw-r--r-- | src/f_pc/f_pc_pause.cpp | 1 |
13 files changed, 20 insertions, 3 deletions
diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp index 5b77008629..57d4fcfca2 100644 --- a/src/f_pc/f_pc_base.cpp +++ b/src/f_pc/f_pc_base.cpp @@ -7,7 +7,10 @@ #include "SSystem/SComponent/c_malloc.h" #include "SSystem/SComponent/c_phase.h" #include "SSystem/SStandard/s_basic.h" +#include "f_pc/f_pc_layer.h" +#include "f_pc/f_pc_method.h" #include "f_pc/f_pc_pause.h" +#include "f_pc/f_pc_profile.h" #include "global.h" /* 8002064C-8002065C 0010+00 s=0 e=14 z=0 None .text fpcBs_Is_JustOfType__Fii */ diff --git a/src/f_pc/f_pc_create_iter.cpp b/src/f_pc/f_pc_create_iter.cpp index 388e2c9a1e..9c55e32774 100644 --- a/src/f_pc/f_pc_create_iter.cpp +++ b/src/f_pc/f_pc_create_iter.cpp @@ -3,8 +3,11 @@ * Framework - Process Create Iteration */ +#include "SSystem/SComponent/c_list_iter.h" +#include "SSystem/SComponent/c_tag_iter.h" #include "f_pc/f_pc_create_iter.h" #include "f_pc/f_pc_create_req.h" +#include "f_pc/f_pc_layer.h" /* 800209C8-80020A04 003C+00 s=0 e=1 z=0 None .text fpcCtIt_Method__FPFPvPv_iPv */ s32 fpcCtIt_Method(fpcCtIt_MethodFunc i_judgeFunc, void* i_data) { diff --git a/src/f_pc/f_pc_create_req.cpp b/src/f_pc/f_pc_create_req.cpp index cc1b2b3c05..6d559553ce 100644 --- a/src/f_pc/f_pc_create_req.cpp +++ b/src/f_pc/f_pc_create_req.cpp @@ -5,10 +5,12 @@ #include "f_pc/f_pc_create_req.h" #include "SSystem/SComponent/c_malloc.h" +#include "f_pc/f_pc_base.h" #include "f_pc/f_pc_create_iter.h" #include "f_pc/f_pc_create_tag.h" #include "f_pc/f_pc_deletor.h" #include "f_pc/f_pc_executor.h" +#include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_layer_iter.h" /* 80020ACC-80020AE8 001C+00 s=1 e=0 z=0 None .text fpcCtRq_isCreatingByID__FP10create_tagPUi diff --git a/src/f_pc/f_pc_delete_tag.cpp b/src/f_pc/f_pc_delete_tag.cpp index 9655e55f6d..2a419c4afd 100644 --- a/src/f_pc/f_pc_delete_tag.cpp +++ b/src/f_pc/f_pc_delete_tag.cpp @@ -3,10 +3,10 @@ * Framework - Process Delete Tag */ +#include "SSystem/SComponent/c_list.h" #include "f_pc/f_pc_delete_tag.h" #include "global.h" - /* ############################################################################################## */ /* 803A39A0-803A39B0 000C+04 s=2 e=1 z=0 None .data g_fpcDtTg_Queue */ node_list_class g_fpcDtTg_Queue = {NULL, NULL, 0}; diff --git a/src/f_pc/f_pc_draw.cpp b/src/f_pc/f_pc_draw.cpp index bb31ce453b..26f2ba09e9 100644 --- a/src/f_pc/f_pc_draw.cpp +++ b/src/f_pc/f_pc_draw.cpp @@ -6,6 +6,7 @@ #include "f_pc/f_pc_draw.h" #include "SSystem/SComponent/c_API_graphic.h" #include "f_pc/f_pc_leaf.h" +#include "f_pc/f_pc_node.h" #include "f_pc/f_pc_pause.h" /* 80023954-800239F4 00A0+00 s=0 e=1 z=0 None .text fpcDw_Execute__FP18base_process_class */ diff --git a/src/f_pc/f_pc_fstcreate_req.cpp b/src/f_pc/f_pc_fstcreate_req.cpp index 9ce751bbc6..9fe86ede4e 100644 --- a/src/f_pc/f_pc_fstcreate_req.cpp +++ b/src/f_pc/f_pc_fstcreate_req.cpp @@ -6,6 +6,8 @@ #include "f_pc/f_pc_fstcreate_req.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_pc/f_pc_base.h" +#include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_load.h" /* 80023A48-80023A98 0050+00 s=1 e=3 z=52 None .text fpcFCtRq_Do__FP19fast_create_request */ diff --git a/src/f_pc/f_pc_layer_iter.cpp b/src/f_pc/f_pc_layer_iter.cpp index 6e9aaa7974..bb1f36ceed 100644 --- a/src/f_pc/f_pc_layer_iter.cpp +++ b/src/f_pc/f_pc_layer_iter.cpp @@ -7,6 +7,7 @@ #include "SSystem/SComponent/c_node_iter.h" #include "SSystem/SComponent/c_tag_iter.h" #include "SSystem/SComponent/c_tree_iter.h" +#include "f_pc/f_pc_layer.h" /* 80021B88-80021BC0 0038+00 s=1 e=4 z=0 None .text fpcLyIt_OnlyHere__FP11layer_classPFPvPv_iPv */ diff --git a/src/f_pc/f_pc_layer_tag.cpp b/src/f_pc/f_pc_layer_tag.cpp index e1600cb485..228feb9234 100644 --- a/src/f_pc/f_pc_layer_tag.cpp +++ b/src/f_pc/f_pc_layer_tag.cpp @@ -4,6 +4,7 @@ */ #include "f_pc/f_pc_layer_tag.h" +#include "f_pc/f_pc_layer.h" /* 80021CD4-80021DCC 00F8+00 s=1 e=1 z=0 None .text * fpcLyTg_ToQueue__FP26layer_management_tag_classUiUsUs */ diff --git a/src/f_pc/f_pc_line.cpp b/src/f_pc/f_pc_line.cpp index da0d20a41e..389e7e30d1 100644 --- a/src/f_pc/f_pc_line.cpp +++ b/src/f_pc/f_pc_line.cpp @@ -5,8 +5,7 @@ #include "f_pc/f_pc_line.h" #include "f_pc/f_pc_node.h" - -#define ARRAY_SIZE(o) (sizeof((o)) / sizeof(*(o))) +#include "global.h" /* ############################################################################################## */ /* 803F4CF0-803F4DB0 00C0+00 s=2 e=0 z=0 None .bss l_fpcLn_Line */ diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index d8d6f12033..ce71bad583 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -6,6 +6,7 @@ #include "f_pc/f_pc_manager.h" #include "SSystem/SComponent/c_API_graphic.h" #include "d/d_error_msg.h" +#include "d/d_lib.h" #include "f_pc/f_pc_base.h" #include "f_pc/f_pc_create_iter.h" #include "f_pc/f_pc_creator.h" @@ -25,6 +26,7 @@ #include "f_pc/f_pc_pause.h" #include "f_pc/f_pc_priority.h" #include "f_pc/f_pc_profile.h" +#include "m_Do/m_Do_controller_pad.h" /* 800220A0-800220C0 0020+00 s=1 e=1 z=0 None .text fpcM_Draw__FPv */ void fpcM_Draw(void* i_proc) { diff --git a/src/f_pc/f_pc_method_iter.cpp b/src/f_pc/f_pc_method_iter.cpp index 8b63262683..8e32e2e17e 100644 --- a/src/f_pc/f_pc_method_iter.cpp +++ b/src/f_pc/f_pc_method_iter.cpp @@ -3,6 +3,7 @@ * Framework - Process Method Iteration */ +#include "SSystem/SComponent/c_list_iter.h" #include "f_pc/f_pc_method_iter.h" /* 80023764-80023788 0024+00 s=0 e=1 z=0 None .text fpcMtdIt_Method__FP15node_list_classPFPv_i diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp index 8d9d9445fd..029b953719 100644 --- a/src/f_pc/f_pc_node_req.cpp +++ b/src/f_pc/f_pc_node_req.cpp @@ -12,6 +12,7 @@ #include "f_pc/f_pc_deletor.h" #include "f_pc/f_pc_executor.h" #include "f_pc/f_pc_layer.h" +#include "f_pc/f_pc_node.h" #include "f_pc/f_pc_stdcreate_req.h" /* 800227C4-80022804 0040+00 s=1 e=0 z=0 None .text fpcNdRq_RequestQTo__FP19node_create_request diff --git a/src/f_pc/f_pc_pause.cpp b/src/f_pc/f_pc_pause.cpp index eea4efcab4..348c0c5523 100644 --- a/src/f_pc/f_pc_pause.cpp +++ b/src/f_pc/f_pc_pause.cpp @@ -4,6 +4,7 @@ */ #include "f_pc/f_pc_pause.h" +#include "f_pc/f_pc_node.h" #include "f_pc/f_pc_layer_iter.h" /* 80023844-80023868 0024+00 s=0 e=3 z=0 None .text fpcPause_IsEnable__FPvUc */ |
