mirror of
https://github.com/zeldaret/tp
synced 2026-08-22 06:44:53 -04:00
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
This commit is contained in:
@@ -2,17 +2,16 @@
|
||||
#ifndef F_PC_BASE_H_
|
||||
#define F_PC_BASE_H_
|
||||
|
||||
#include "SSystem/SComponent/c_tag.h"
|
||||
#include "dolphin/types.h"
|
||||
// #include "f/f_pc/f_pc_method.h"
|
||||
#include "f_pc/f_pc_delete_tag.h"
|
||||
#include "f_pc/f_pc_layer_tag.h"
|
||||
#include "f_pc/f_pc_line_tag.h"
|
||||
#include "f_pc/f_pc_priority.h"
|
||||
#include "f_pc/f_pc_profile.h"
|
||||
|
||||
struct create_request;
|
||||
struct profile_method_class;
|
||||
typedef struct create_request create_request;
|
||||
typedef struct process_method_class process_method_class;
|
||||
typedef struct process_profile_definition process_profile_definition;
|
||||
typedef struct profile_method_class profile_method_class;
|
||||
|
||||
typedef struct base_process_class {
|
||||
/* 0x00 */ u32 mBsType;
|
||||
|
||||
@@ -2,10 +2,9 @@
|
||||
#ifndef F_PC_CREATE_ITER_H_
|
||||
#define F_PC_CREATE_ITER_H_
|
||||
|
||||
#include "SSystem/SComponent/c_list_iter.h"
|
||||
#include "SSystem/SComponent/c_tag_iter.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "f_pc/f_pc_create_tag.h"
|
||||
|
||||
typedef struct create_tag create_tag;
|
||||
|
||||
typedef int (*fpcCtIt_MethodFunc)(void*, void*);
|
||||
typedef void* (*fpcCtIt_JudgeFunc)(void*, void*);
|
||||
|
||||
@@ -3,14 +3,13 @@
|
||||
#define F_PC_CREATE_REQ_H_
|
||||
|
||||
#include "SSystem/SComponent/c_phase.h"
|
||||
#include "SSystem/SComponent/c_tag.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "f_pc/f_pc_create_tag.h"
|
||||
#include "f_pc/f_pc_layer.h"
|
||||
#include "f_pc/f_pc_method.h"
|
||||
#include "f_pc/f_pc_method_tag.h"
|
||||
|
||||
struct base_process_class;
|
||||
typedef struct base_process_class base_process_class;
|
||||
typedef struct layer_class layer_class;
|
||||
|
||||
typedef struct create_request_method_class {
|
||||
cPhs__Handler mpHandler;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#ifndef F_PC_CREATE_TAG_H_
|
||||
#define F_PC_CREATE_TAG_H_
|
||||
|
||||
#include "SSystem/SComponent/c_list.h"
|
||||
#include "SSystem/SComponent/c_tag.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
#include "dolphin/types.h"
|
||||
|
||||
struct base_process_class;
|
||||
typedef struct base_process_class base_process_class;
|
||||
|
||||
BOOL fpcCt_IsCreatingByID(unsigned int id);
|
||||
s32 fpcCt_IsDoing(struct base_process_class* pProc);
|
||||
BOOL fpcCt_Abort(struct base_process_class* pProc);
|
||||
s32 fpcCt_IsDoing(base_process_class* pProc);
|
||||
BOOL fpcCt_Abort(base_process_class* pProc);
|
||||
void fpcCt_Handler(void);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
|
||||
#include "SSystem/SComponent/c_tag.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "f_pc/f_pc_layer.h"
|
||||
|
||||
typedef struct layer_class layer_class;
|
||||
|
||||
typedef int (*delete_tag_func)(void*);
|
||||
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
#ifndef F_PC_DELETOR_H_
|
||||
#define F_PC_DELETOR_H_
|
||||
|
||||
#include "f_pc/f_pc_base.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
struct base_process_class;
|
||||
typedef struct base_process_class base_process_class;
|
||||
|
||||
BOOL fpcDt_IsComplete(void);
|
||||
s32 fpcDt_ToDeleteQ(base_process_class* pProc);
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#ifndef F_PC_DRAW_H_
|
||||
#define F_PC_DRAW_H_
|
||||
|
||||
#include "SSystem/SComponent/c_node_iter.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "f_pc/f_pc_base.h"
|
||||
|
||||
typedef struct base_process_class base_process_class;
|
||||
|
||||
typedef int (*fpcDw_HandlerFunc)(void*, void*);
|
||||
typedef int (*fpcDw_HandlerFuncFunc)(fpcDw_HandlerFunc);
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
#ifndef F_PC_EXECUTOR_H_
|
||||
#define F_PC_EXECUTOR_H_
|
||||
|
||||
#include "SSystem/SComponent/c_node_iter.h"
|
||||
#include "f_pc/f_pc_base.h"
|
||||
#include "f_pc/f_pc_layer_iter.h"
|
||||
#include "f_pc/f_pc_line_iter.h"
|
||||
|
||||
typedef struct base_process_class base_process_class;
|
||||
|
||||
base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData);
|
||||
base_process_class* fpcEx_SearchByID(unsigned int id);
|
||||
BOOL fpcEx_IsExist(unsigned int id);
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
#define F_PC_FSTCREATE_REQ_H_
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "f_pc/f_pc_base.h"
|
||||
#include "f_pc/f_pc_create_req.h"
|
||||
#include "f_pc/f_pc_layer.h"
|
||||
|
||||
typedef struct base_process_class base_process_class;
|
||||
typedef struct layer_class layer_class;
|
||||
|
||||
typedef int (*fstCreateFunc)(void*, void*);
|
||||
|
||||
|
||||
@@ -2,12 +2,13 @@
|
||||
#ifndef F_PC_LAYER_H_
|
||||
#define F_PC_LAYER_H_
|
||||
|
||||
#include "SSystem/SComponent/c_list.h"
|
||||
#include "SSystem/SComponent/c_node.h"
|
||||
#include "SSystem/SComponent/c_tag.h"
|
||||
#include "SSystem/SComponent/c_tree.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
struct process_method_tag_class;
|
||||
typedef struct create_tag_class create_tag_class;
|
||||
typedef struct process_method_tag_class process_method_tag_class;
|
||||
typedef struct process_node_class process_node_class;
|
||||
|
||||
typedef struct layer_class {
|
||||
@@ -41,10 +42,10 @@ s32 fpcLy_ToQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag);
|
||||
s32 fpcLy_QueueTo(layer_class* pLayer, create_tag_class* pTag);
|
||||
|
||||
void fpcLy_Cancel(layer_class* pLayer);
|
||||
bool fpcLy_CancelMethod(struct process_method_tag_class* pLayer);
|
||||
bool fpcLy_CancelMethod(process_method_tag_class* pLayer);
|
||||
|
||||
void fpcLy_CancelQTo(struct process_method_tag_class* pMthd);
|
||||
s32 fpcLy_ToCancelQ(layer_class* pLayer, struct process_method_tag_class* pMthd);
|
||||
void fpcLy_CancelQTo(process_method_tag_class* pMthd);
|
||||
s32 fpcLy_ToCancelQ(layer_class* pLayer, process_method_tag_class* pMthd);
|
||||
|
||||
void fpcLy_Create(layer_class* pLayer, void* pPcNode, node_list_class* pLists, int listNum);
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#ifndef F_PC_LAYER_ITER_H_
|
||||
#define F_PC_LAYER_ITER_H_
|
||||
|
||||
#include "SSystem/SComponent/c_node_iter.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "f_pc/f_pc_layer.h"
|
||||
|
||||
typedef struct layer_class layer_class;
|
||||
|
||||
typedef struct layer_iter {
|
||||
void* mpFunc;
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
|
||||
#include "SSystem/SComponent/c_tag.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "f_pc/f_pc_layer.h"
|
||||
|
||||
typedef struct layer_class layer_class;
|
||||
|
||||
typedef struct layer_management_tag_class {
|
||||
create_tag_class mCreateTag;
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
#include "f_pc/f_pc_base.h"
|
||||
#include "f_pc/f_pc_draw_priority.h"
|
||||
#include "f_pc/f_pc_method.h"
|
||||
#include "f_pc/f_pc_profile.h"
|
||||
|
||||
typedef struct leafdraw_method_class {
|
||||
/* 0x00 */ process_method_class mBase;
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
#ifndef F_PC_LINE_ITER_H_
|
||||
#define F_PC_LINE_ITER_H_
|
||||
|
||||
#include "SSystem/SComponent/c_node_iter.h"
|
||||
|
||||
typedef int (*fpcLnIt_QueueFunc)(void*, void*);
|
||||
|
||||
void fpcLnIt_Queue(fpcLnIt_QueueFunc pFunc);
|
||||
|
||||
@@ -1,16 +1,14 @@
|
||||
#ifndef F_PC_MANAGER_H_
|
||||
#define F_PC_MANAGER_H_
|
||||
|
||||
#include "SSystem/SComponent/c_node_iter.h"
|
||||
#include "SSystem/SComponent/c_tag.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "f_pc/f_pc_base.h"
|
||||
#include "f_pc/f_pc_create_iter.h"
|
||||
#include "f_pc/f_pc_node_req.h"
|
||||
#include "f_pc/f_pc_stdcreate_req.h"
|
||||
#include "f_pc/f_pc_executor.h"
|
||||
#include "f_pc/f_pc_leaf.h"
|
||||
#include "f_pc/f_pc_layer_iter.h"
|
||||
#include "f_pc/f_pc_node.h"
|
||||
#include "f_pc/f_pc_stdcreate_req.h"
|
||||
|
||||
enum {
|
||||
fpcM_ERROR_PROCESS_ID_e = -1,
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
#ifndef F_PC_METHOD_ITER_H_
|
||||
#define F_PC_METHOD_ITER_H_
|
||||
|
||||
#include "SSystem/SComponent/c_list_iter.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
typedef struct node_list_class node_list_class;
|
||||
|
||||
typedef int (*fpcMtdIt_MethodFunc)(void*);
|
||||
|
||||
void fpcMtdIt_Method(node_list_class* pList, fpcMtdIt_MethodFunc pMethod);
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "f_pc/f_pc_base.h"
|
||||
#include "f_pc/f_pc_layer.h"
|
||||
#include "f_pc/f_pc_method.h"
|
||||
#include "f_pc/f_pc_profile.h"
|
||||
|
||||
typedef struct nodedraw_method_class {
|
||||
process_method_class mBase;
|
||||
|
||||
@@ -2,10 +2,13 @@
|
||||
#define F_PC_NODE_REQ_H_
|
||||
|
||||
#include "SSystem/SComponent/c_phase.h"
|
||||
#include "SSystem/SComponent/c_tag.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "f_pc/f_pc_method.h"
|
||||
#include "f_pc/f_pc_method_tag.h"
|
||||
#include "f_pc/f_pc_node.h"
|
||||
|
||||
typedef struct layer_class layer_class;
|
||||
typedef struct process_node_class process_node_class;
|
||||
|
||||
typedef struct node_create_request_method_class {
|
||||
process_method_func mpExecuteFunc;
|
||||
@@ -53,15 +56,15 @@ s32 fpcNdRq_Execute(node_create_request* pNodeCreateReq);
|
||||
s32 fpcNdRq_Delete(node_create_request* pNodeCreateReq);
|
||||
s32 fpcNdRq_Cancel(node_create_request* pNodeCreateReq);
|
||||
s32 fpcNdRq_Handler(void);
|
||||
s32 fpcNdRq_IsPossibleTarget(struct process_node_class* pProcNode);
|
||||
s32 fpcNdRq_IsIng(struct process_node_class* pProcNode);
|
||||
s32 fpcNdRq_IsPossibleTarget(process_node_class* pProcNode);
|
||||
s32 fpcNdRq_IsIng(process_node_class* pProcNode);
|
||||
node_create_request* fpcNdRq_Create(u32 pRequestSize);
|
||||
node_create_request* fpcNdRq_ChangeNode(u32 pRequestSize, struct process_node_class* pProcNode,
|
||||
node_create_request* fpcNdRq_ChangeNode(u32 pRequestSize, process_node_class* pProcNode,
|
||||
s16 param_3, void* param_4);
|
||||
node_create_request* fpcNdRq_DeleteNode(u32 pRequestSize, struct process_node_class* pProcNode);
|
||||
node_create_request* fpcNdRq_DeleteNode(u32 pRequestSize, process_node_class* pProcNode);
|
||||
node_create_request* fpcNdRq_CreateNode(u32 pRequestSize, s16 param_2, void* param_3);
|
||||
node_create_request*
|
||||
fpcNdRq_Request(u32 param_1, int param_2, struct process_node_class* param_3, s16 param_4,
|
||||
fpcNdRq_Request(u32 param_1, int param_2, process_node_class* param_3, s16 param_4,
|
||||
void* param_5, node_create_request_method_class* pNodeCreateRequestMethodClass);
|
||||
s32 fpcNdRq_ReChangeNode(unsigned int pRequestId, s16 param_2, void* param_3);
|
||||
s32 fpcNdRq_ReRequest(unsigned int pRequestId, s16 param_2, void* param_3);
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
#define F_PC_PAUSE_
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "f_pc/f_pc_base.h"
|
||||
#include "f_pc/f_pc_node.h"
|
||||
|
||||
s32 fpcPause_IsEnable(void* pProc, u8 expected);
|
||||
s32 fpcPause_Enable(void* pProc, u8 pauseMask);
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
#define F_PC_PROFILE_H_
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "f_pc/f_pc_method.h"
|
||||
|
||||
struct nodedraw_method_class;
|
||||
struct leafdraw_method_class;
|
||||
typedef struct nodedraw_method_class nodedraw_method_class;
|
||||
typedef struct leafdraw_method_class leafdraw_method_class;
|
||||
typedef struct process_method_class process_method_class;
|
||||
|
||||
typedef struct process_profile_definition {
|
||||
/* 0x00 */ s32 mLayerID;
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "f_pc/f_pc_create_req.h"
|
||||
#include "f_pc/f_pc_layer.h"
|
||||
|
||||
typedef struct layer_class layer_class;
|
||||
|
||||
typedef int (*stdCreateFunc)(void*, void*);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user