run clang-format

This commit is contained in:
Pheenoh
2020-12-26 11:31:49 -05:00
parent 64a6a97b7b
commit 4c504d078d
180 changed files with 4083 additions and 4253 deletions
+1 -3
View File
@@ -1,8 +1,6 @@
#ifndef F_OP_ACTOR_H_
#define F_OP_ACTOR_H_
class fopAc_ac_c{
};
class fopAc_ac_c {};
#endif
+1 -2
View File
@@ -1,15 +1,14 @@
#ifndef F_OP_ACTOR_TAG_H
#define F_OP_ACTOR_TAG_H
#include "global.h"
#include "SComponent/c_tag.h"
#include "global.h"
extern "C" {
u32 fopAcTg_ToActorQ(create_tag_class* c);
u32 fopAcTg_ActorQTo(create_tag_class* c);
u32 fopAcTg_Init(create_tag_class* c, void* data);
}
#endif
+8 -9
View File
@@ -2,12 +2,12 @@
#ifndef F_PC_BASE_H
#define F_PC_BASE_H
#include "global.h"
#include "SComponent/c_tag.h"
#include "f/f_pc/f_pc_line_tag.h"
#include "f/f_pc/f_pc_layer_tag.h"
#include "f/f_pc/f_pc_delete_tag.h"
#include "f/f_pc/f_pc_layer_tag.h"
#include "f/f_pc/f_pc_line_tag.h"
#include "f/f_pc/f_pc_priority.h"
#include "global.h"
struct create_request;
struct profile_method_class;
@@ -21,14 +21,14 @@ struct base_process_class {
s8 mInitState;
u8 mUnk2;
s16 mBsTypeId;
void *mpProf;
create_request *mpCtRq;
void* mpProf;
create_request* mpCtRq;
layer_management_tag_class mLyTg;
line_tag mLnTg;
delete_tag_class mDtTg;
process_priority_class mPi;
profile_method_class *mpPcMtd;
void *mpUserData;
profile_method_class* mpPcMtd;
void* mpUserData;
u32 mParameters;
u32 mSubType;
};
@@ -36,8 +36,7 @@ struct base_process_class {
extern "C" {
int fpcBs_Is_JustOfType(int a, int b);
int fpcBs_Execute(base_process_class *pProc);
int fpcBs_Execute(base_process_class* pProc);
};
#endif
+2 -3
View File
@@ -6,9 +6,8 @@
extern "C" {
int fpcCtIt_Method(cNdIt_MethodFunc pJudge, void *pUserData);
void * fpcCtIt_Judge(cNdIt_JudgeFunc pJudge, void *pUserData);
int fpcCtIt_Method(cNdIt_MethodFunc pJudge, void* pUserData);
void* fpcCtIt_Judge(cNdIt_JudgeFunc pJudge, void* pUserData);
};
#endif
+13 -13
View File
@@ -2,12 +2,12 @@
#ifndef F_PC_CREATE_REQ_H
#define F_PC_CREATE_REQ_H
#include "global.h"
#include "SComponent/c_phase.h"
#include "SComponent/c_tag.h"
#include "f/f_pc/f_pc_create_tag.h"
#include "f/f_pc/f_pc_method.h"
#include "f/f_pc/f_pc_method_tag.h"
#include "global.h"
struct base_process_class;
struct layer_class;
@@ -22,25 +22,25 @@ struct create_request : public create_tag {
s8 mbIsCreating;
s8 mbIsCancelling;
process_method_tag_class mMtdTg;
create_request_method_class *mpCtRqMtd;
void *mpUnk1;
create_request_method_class* mpCtRqMtd;
void* mpUnk1;
int mBsPcId;
base_process_class *mpRes;
layer_class *mpLayer;
base_process_class* mpRes;
layer_class* mpLayer;
};
extern "C" {
bool fpcCtRq_isCreatingByID(create_tag *pTag, int *pId);
bool fpcCtRq_isCreatingByID(create_tag* pTag, int* pId);
bool fpcCtRq_IsCreatingByID(unsigned int id);
void fpcCtRq_CreateQTo(create_request *pReq);
void fpcCtRq_ToCreateQ(create_request *pReq);
bool fpcCtRq_Delete(create_request *pReq);
bool fpcCtRq_Cancel(create_request *pReq);
int fpcCtRq_IsDoing(create_request *pReq);
void fpcCtRq_CreateQTo(create_request* pReq);
void fpcCtRq_ToCreateQ(create_request* pReq);
bool fpcCtRq_Delete(create_request* pReq);
bool fpcCtRq_Cancel(create_request* pReq);
int fpcCtRq_IsDoing(create_request* pReq);
void fpcCtRq_Handler(void);
create_request * fpcCtRq_Create(layer_class *pLayer, unsigned long size, create_request_method_class *pCtRqMtd);
create_request* fpcCtRq_Create(layer_class* pLayer, unsigned long size,
create_request_method_class* pCtRqMtd);
};
#endif
+5 -7
View File
@@ -2,18 +2,16 @@
#ifndef F_PC_CREATE_TAG_H
#define F_PC_CREATE_TAG_H
#include "global.h"
#include "SComponent/c_tag.h"
#include "global.h"
struct create_tag : public create_tag_class {
};
struct create_tag : public create_tag_class {};
extern "C" {
void fpcCtTg_ToCreateQ(create_tag_class *pTag);
void fpcCtTg_CreateQTo(create_tag_class *pTag);
int fpcCtTg_Init(create_tag *pTag, void *pUserData);
void fpcCtTg_ToCreateQ(create_tag_class* pTag);
void fpcCtTg_CreateQTo(create_tag_class* pTag);
int fpcCtTg_Init(create_tag* pTag, void* pUserData);
};
#endif
+2 -3
View File
@@ -9,10 +9,9 @@ struct base_process_class;
extern "C" {
bool fpcCt_IsCreatingByID(unsigned int id);
int fpcCt_IsDoing(base_process_class *pProc);
void fpcCt_Abort(base_process_class *pProc);
int fpcCt_IsDoing(base_process_class* pProc);
void fpcCt_Abort(base_process_class* pProc);
void fpcCt_Handler(void);
};
#endif
+7 -8
View File
@@ -2,26 +2,25 @@
#ifndef F_PC_DELETE_TAG_H
#define F_PC_DELETE_TAG_H
#include "global.h"
#include "SComponent/c_tag.h"
#include "global.h"
struct layer_class;
typedef int (*delete_tag_func)(void*);
struct delete_tag_class : public create_tag_class {
layer_class *mpLayer;
layer_class* mpLayer;
s16 mTimer;
};
extern "C" {
bool fpcDtTg_IsEmpty(delete_tag_class *pTag);
void fpcDtTg_ToDeleteQ(delete_tag_class *pTag);
void fpcDtTg_DeleteQTo(delete_tag_class *pTag);
int fpcDtTg_Do(delete_tag_class *pTag, delete_tag_func pFunc);
int fpcDtTg_Init(delete_tag_class *pTag, void *pUserData);
bool fpcDtTg_IsEmpty(delete_tag_class* pTag);
void fpcDtTg_ToDeleteQ(delete_tag_class* pTag);
void fpcDtTg_DeleteQTo(delete_tag_class* pTag);
int fpcDtTg_Do(delete_tag_class* pTag, delete_tag_func pFunc);
int fpcDtTg_Init(delete_tag_class* pTag, void* pUserData);
};
#endif
+3 -4
View File
@@ -9,11 +9,10 @@ struct base_process_class;
extern "C" {
bool fpcDt_IsComplete(void);
int fpcDt_ToDeleteQ(base_process_class *pProc);
int fpcDt_ToQueue(base_process_class *pProc);
int fpcDt_ToDeleteQ(base_process_class* pProc);
int fpcDt_ToQueue(base_process_class* pProc);
void fpcDt_Handler(void);
int fpcDt_Delete(base_process_class *pProc);
int fpcDt_Delete(base_process_class* pProc);
};
#endif
+3 -4
View File
@@ -8,10 +8,9 @@ struct draw_priority_class {
extern "C" {
int fpcDwPi_Get(draw_priority_class *pDwPi);
void fpcDwPi_Set(draw_priority_class *pDwPi, int p);
void fpcDwPi_Init(draw_priority_class *pDwPi, int p);
int fpcDwPi_Get(draw_priority_class* pDwPi);
void fpcDwPi_Set(draw_priority_class* pDwPi, int p);
void fpcDwPi_Init(draw_priority_class* pDwPi, int p);
};
#endif
+3 -4
View File
@@ -8,11 +8,10 @@ struct base_process_class;
extern "C" {
int fpcEx_ToLineQ(base_process_class *pProc);
int fpcEx_ExecuteQTo(base_process_class *pProc);
int fpcEx_ToExecuteQ(base_process_class *pProc);
int fpcEx_ToLineQ(base_process_class* pProc);
int fpcEx_ExecuteQTo(base_process_class* pProc);
int fpcEx_ToExecuteQ(base_process_class* pProc);
void fpcEx_Handler(cNdIt_MethodFunc pFunc);
};
#endif
+30 -28
View File
@@ -2,53 +2,55 @@
#ifndef F_PC_LAYER_H
#define F_PC_LAYER_H
#include "global.h"
#include "SComponent/c_node.h"
#include "SComponent/c_tree.h"
#include "SComponent/c_tag.h"
#include "SComponent/c_tree.h"
#include "global.h"
struct process_method_tag_class;
struct process_node_class;
struct layer_class {
node_class mNode; // generates different asm for struct copy if using inheritance
node_class mNode; // generates different asm for struct copy if using inheritance
u32 mLayerID;
node_lists_tree_class mNodeListTree;
process_node_class *mpPcNode;
process_node_class* mpPcNode;
node_list_class mCancelList;
s32 mCreatingCount:16;// for some reason, the compiler only optimized these into a single word load/store instead of 2 halfword load/store, but only if they are written like this
s32 mDeletingCount:16;
s32 mCreatingCount : 16; // for some reason, the compiler only optimized these into a single
// word load/store instead of 2 halfword load/store, but only if they
// are written like this
s32 mDeletingCount : 16;
};
extern "C" {
void fpcLy_SetCurrentLayer(layer_class *pLayer);
layer_class * fpcLy_CurrentLayer(void);
layer_class * fpcLy_RootLayer(void);
layer_class * fpcLy_Layer(unsigned int id);
layer_class * fpcLy_Search(unsigned int id);
void fpcLy_Regist(layer_class *pLayer);
void fpcLy_SetCurrentLayer(layer_class* pLayer);
layer_class* fpcLy_CurrentLayer(void);
layer_class* fpcLy_RootLayer(void);
layer_class* fpcLy_Layer(unsigned int id);
layer_class* fpcLy_Search(unsigned int id);
void fpcLy_Regist(layer_class* pLayer);
void fpcLy_CreatedMesg(layer_class *pLayer);
void fpcLy_CreatingMesg(layer_class *pLayer);
void fpcLy_DeletedMesg(layer_class *pLayer);
void fpcLy_DeletingMesg(layer_class *pLayer);
bool fpcLy_IsCreatingMesg(layer_class *pLayer);
bool fpcLy_IsDeletingMesg(layer_class *pLayer);
void fpcLy_CreatedMesg(layer_class* pLayer);
void fpcLy_CreatingMesg(layer_class* pLayer);
void fpcLy_DeletedMesg(layer_class* pLayer);
void fpcLy_DeletingMesg(layer_class* pLayer);
bool fpcLy_IsCreatingMesg(layer_class* pLayer);
bool fpcLy_IsDeletingMesg(layer_class* pLayer);
int fpcLy_IntoQueue(layer_class *pLayer, int treeListIdx, create_tag_class *pTag, int idx);
int fpcLy_ToQueue(layer_class *pLayer, int treeListIdx, create_tag_class *pTag);
int fpcLy_QueueTo(layer_class *pLayer, create_tag_class *pTag);
int fpcLy_IntoQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag, int idx);
int fpcLy_ToQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag);
int fpcLy_QueueTo(layer_class* pLayer, create_tag_class* pTag);
void fpcLy_Cancel(layer_class *pLayer);
bool fpcLy_CancelMethod(process_method_tag_class *pLayer);
void fpcLy_Cancel(layer_class* pLayer);
bool fpcLy_CancelMethod(process_method_tag_class* pLayer);
void fpcLy_CancelQTo(process_method_tag_class *pMthd);
int fpcLy_ToCancelQ(layer_class *pLayer, process_method_tag_class *pMthd);
void fpcLy_Create(layer_class *pLayer, process_node_class *pPcNode, node_list_class *pLists, int listNum);
int fpcLy_Delete(layer_class *pLayer);
void fpcLy_CancelQTo(process_method_tag_class* pMthd);
int fpcLy_ToCancelQ(layer_class* pLayer, process_method_tag_class* pMthd);
void fpcLy_Create(layer_class* pLayer, process_node_class* pPcNode, node_list_class* pLists,
int listNum);
int fpcLy_Delete(layer_class* pLayer);
};
#endif
+6 -7
View File
@@ -1,9 +1,9 @@
#ifndef F_PC_LAYER_ITER_H
#define F_PC_LAYER_ITER_H
#include "global.h"
#include "f/f_pc/f_pc_layer.h"
#include "SComponent/c_node_iter.h"
#include "f/f_pc/f_pc_layer.h"
#include "global.h"
struct layer_iter {
void* mpFunc;
@@ -12,11 +12,10 @@ struct layer_iter {
extern "C" {
int fpcLyIt_OnlyHere(layer_class *pLayer, cNdIt_MethodFunc pFunc, void *pUserData);
int fpcLyIt_OnlyHereLY(layer_class *pLayer, cNdIt_MethodFunc pFunc, void *pUserData);
void * fpcLyIt_Judge(layer_class *pLayer, cNdIt_MethodFunc pFunc, void *pUserData);
void * fpcLyIt_AllJudge(cNdIt_MethodFunc pFunc, void *pUserData);
int fpcLyIt_OnlyHere(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserData);
int fpcLyIt_OnlyHereLY(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserData);
void* fpcLyIt_Judge(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserData);
void* fpcLyIt_AllJudge(cNdIt_MethodFunc pFunc, void* pUserData);
}
#endif
+6 -7
View File
@@ -2,25 +2,24 @@
#ifndef F_PC_LAYER_TAG_H
#define F_PC_LAYER_TAG_H
#include "global.h"
#include "SComponent/c_tag.h"
#include "global.h"
struct layer_class;
struct layer_management_tag_class {
create_tag_class mCreateTag;
layer_class *mpLayer;
layer_class* mpLayer;
u16 mNodeListID;
u16 mNodeListIdx;
};
extern "C" {
s32 fpcLyTg_QueueTo(layer_management_tag_class *pTag);
s32 fpcLyTg_ToQueue(layer_management_tag_class *pTag, u32 layerID, u16 listID, u16 listPrio);
s32 fpcLyTg_Move(layer_management_tag_class *, u32, u16, u16);
s32 fpcLyTg_Init(layer_management_tag_class *, u32, void *);
s32 fpcLyTg_QueueTo(layer_management_tag_class* pTag);
s32 fpcLyTg_ToQueue(layer_management_tag_class* pTag, u32 layerID, u16 listID, u16 listPrio);
s32 fpcLyTg_Move(layer_management_tag_class*, u32, u16, u16);
s32 fpcLyTg_Init(layer_management_tag_class*, u32, void*);
}
#endif
+4 -5
View File
@@ -11,7 +11,7 @@ struct leafdraw_method_class : public process_method_class {
};
struct leafdraw_class : public base_process_class {
leafdraw_method_class *mpDrawMtd;
leafdraw_method_class* mpDrawMtd;
u8 mbUnk0;
u8 mbUnk1;
draw_priority_class mDwPi;
@@ -19,10 +19,9 @@ struct leafdraw_class : public base_process_class {
extern "C" {
int fpcLf_GetPriority(leafdraw_class *pLeaf);
int fpcLf_DrawMethod(leafdraw_method_class *pMthd, void *pUserData);
int fpcLf_Draw(leafdraw_class *pMthd);
int fpcLf_GetPriority(leafdraw_class* pLeaf);
int fpcLf_DrawMethod(leafdraw_method_class* pMthd, void* pUserData);
int fpcLf_Draw(leafdraw_class* pMthd);
};
#endif
-1
View File
@@ -7,7 +7,6 @@
extern "C" {
void fpcLnIt_Queue(cNdIt_MethodFunc pFunc);
};
#endif
+4 -5
View File
@@ -10,11 +10,10 @@ struct line_tag : public create_tag_class {
extern "C" {
int fpcLnTg_Move(line_tag *pLineTag, int newLineListID);
void fpcLnTg_QueueTo(line_tag *pLineTag);
int fpcLnTg_ToQueue(line_tag *pLineTag, int lineListID);
void fpcLnTg_Init(line_tag *pLineTag, void *pData);
int fpcLnTg_Move(line_tag* pLineTag, int newLineListID);
void fpcLnTg_QueueTo(line_tag* pLineTag);
int fpcLnTg_ToQueue(line_tag* pLineTag, int lineListID);
void fpcLnTg_Init(line_tag* pLineTag, void* pData);
};
#endif
-1
View File
@@ -10,7 +10,6 @@ bool fpcLd_Use(u16 procName);
int fpcLd_IsLoaded(u16 procName);
void fpcLd_Free(u16 procName);
int fpcLd_Load(u16 procName);
};
#endif
+6 -7
View File
@@ -2,7 +2,7 @@
#ifndef F_PC_METHOD_H
#define F_PC_METHOD_H
typedef int (*process_method_func)(void *);
typedef int (*process_method_func)(void*);
struct process_method_class {
process_method_func mpCreateFunc;
@@ -13,12 +13,11 @@ struct process_method_class {
extern "C" {
int fpcMtd_Method(process_method_func pFunc, void *pUserData);
int fpcMtd_Execute(process_method_class *pMthd, void *pUserData);
int fpcMtd_IsDelete(process_method_class *pMthd, void *pUserData);
int fpcMtd_Delete(process_method_class *pMthd, void *pUserData);
int fpcMtd_Create(process_method_class *pMthd, void *pUserData);
int fpcMtd_Method(process_method_func pFunc, void* pUserData);
int fpcMtd_Execute(process_method_class* pMthd, void* pUserData);
int fpcMtd_IsDelete(process_method_class* pMthd, void* pUserData);
int fpcMtd_Delete(process_method_class* pMthd, void* pUserData);
int fpcMtd_Create(process_method_class* pMthd, void* pUserData);
};
#endif
+1 -2
View File
@@ -6,8 +6,7 @@
extern "C" {
void fpcMtdIt_Method(node_list_class *pList, cNdIt_MethodFunc pMethod);
void fpcMtdIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod);
};
#endif
+6 -7
View File
@@ -4,20 +4,19 @@
#include "SComponent/c_tag.h"
typedef int (*process_method_tag_func)(void *);
typedef int (*process_method_tag_func)(void*);
struct process_method_tag_class : public create_tag_class {
process_method_tag_func mpFunc;
void *mpMthdData;
void* mpMthdData;
};
extern "C" {
int fpcMtdTg_Do(process_method_tag_class *pMthd);
int fpcMtdTg_ToMethodQ(node_list_class *pList, process_method_tag_class *pMthd);
void fpcMtdTg_MethodQTo(process_method_tag_class *pMthd);
int fpcMtdTg_Init(process_method_tag_class *pMthd, process_method_tag_func pFunc, void *pMthdData);
int fpcMtdTg_Do(process_method_tag_class* pMthd);
int fpcMtdTg_ToMethodQ(node_list_class* pList, process_method_tag_class* pMthd);
void fpcMtdTg_MethodQTo(process_method_tag_class* pMthd);
int fpcMtdTg_Init(process_method_tag_class* pMthd, process_method_tag_func pFunc, void* pMthdData);
};
#endif
+3 -4
View File
@@ -3,11 +3,11 @@
#define F_PC_NODE_H
#include "f/f_pc/f_pc_base.h"
#include "f/f_pc/f_pc_method.h"
#include "f/f_pc/f_pc_layer.h"
#include "f/f_pc/f_pc_method.h"
struct process_node_class : public base_process_class {
process_method_class *mpNodeMtd;
process_method_class* mpNodeMtd;
layer_class mLayer;
node_list_class mLayerNodeLists[16];
u8 mUnk0;
@@ -15,9 +15,8 @@ struct process_node_class : public base_process_class {
extern "C" {
int fpcNd_Create(process_node_class *pNode);
int fpcNd_Create(process_node_class* pNode);
bool fpcNd_IsDeleteTiming(void);
};
#endif
+4 -5
View File
@@ -6,11 +6,10 @@
extern "C" {
bool fpcPause_IsEnable(void *pProcess, u8 flag);
int fpcPause_Enable(void *pProcess, u8 flag);
int fpcPause_Disable(void *pProcess, u32 flag);
void fpcPause_Init(void *pProcess);
bool fpcPause_IsEnable(void* pProcess, u8 flag);
int fpcPause_Enable(void* pProcess, u8 flag);
int fpcPause_Disable(void* pProcess, u32 flag);
void fpcPause_Init(void* pProcess);
};
#endif
+10 -9
View File
@@ -2,9 +2,9 @@
#ifndef F_PC_PRIORITY_H
#define F_PC_PRIORITY_H
#include "global.h"
#include "SComponent/c_tag.h"
#include "f/f_pc/f_pc_method_tag.h"
#include "global.h"
struct process_priority_queue_info {
u32 mLayer;
@@ -20,16 +20,17 @@ struct process_priority_class : public create_tag_class {
extern "C" {
int fpcPi_IsInQueue(process_priority_class *pPi);
int fpcPi_QueueTo(process_priority_class *pPi);
int fpcPi_ToQueue(process_priority_class *pPi);
process_priority_class * fpcPi_GetFromQueue(void);
int fpcPi_Delete(process_priority_class *pPi);
int fpcPi_IsInQueue(process_priority_class* pPi);
int fpcPi_QueueTo(process_priority_class* pPi);
int fpcPi_ToQueue(process_priority_class* pPi);
process_priority_class* fpcPi_GetFromQueue(void);
int fpcPi_Delete(process_priority_class* pPi);
int fpcPi_IsNormal(unsigned int layer, unsigned short listID, unsigned short priority);
int fpcPi_Change(process_priority_class *pPi, unsigned int layer, unsigned short listID, unsigned short priority);
int fpcPi_Change(process_priority_class* pPi, unsigned int layer, unsigned short listID,
unsigned short priority);
int fpcPi_Handler(void);
int fpcPi_Init(process_priority_class *pPi, void *pUserData, unsigned int layer, unsigned short listID, unsigned short priority);
int fpcPi_Init(process_priority_class* pPi, void* pUserData, unsigned int layer,
unsigned short listID, unsigned short priority);
};
#endif
+1 -2
View File
@@ -6,8 +6,7 @@
extern "C" {
void * fpcPf_Get(s16 profileID);
void* fpcPf_Get(s16 profileID);
};
#endif
+2 -3
View File
@@ -8,9 +8,8 @@ struct base_process_class;
extern "C" {
void * fpcSch_JudgeForPName(base_process_class *pProc, void *pUserData);
void * fpcSch_JudgeByID(base_process_class *pProc, void *pUserData);
void* fpcSch_JudgeForPName(base_process_class* pProc, void* pUserData);
void* fpcSch_JudgeByID(base_process_class* pProc, void* pUserData);
};
#endif