From 65bf86bac6f3b39743d6ed31214ff4b019fb7149 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 27 Mar 2021 18:31:42 -0400 Subject: [PATCH] clang-format --- .../JSystem/J2DGraph/J2DPicture/J2DPicture.h | 14 +++++----- include/f/f_op/f_op_msg_mng.h | 4 +-- src/f/f_op/f_op_draw_iter.cpp | 2 +- src/f/f_op/f_op_draw_tag.cpp | 6 ++--- src/f/f_op/f_op_kankyo.cpp | 2 +- src/f/f_op/f_op_msg_mng.cpp | 26 +++++++++---------- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h index 996b1d22ad6..0699da15b33 100644 --- a/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h +++ b/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h @@ -2,8 +2,8 @@ #define J2DPICTURE_H_ #include "JSystem/J2DGraph/J2DPane.h" -#include "JSystem/JUtility/JUTTexture.h" #include "JSystem/JGeometry/JGeometry.h" +#include "JSystem/JUtility/JUTTexture.h" #include "dolphin/types.h" // define and move to appropriate header later @@ -12,7 +12,7 @@ class JUTPalette; class J2DPicture : public J2DPane { public: virtual void initiate(); - virtual u32 prepareTexture(); // return type may be wrong + virtual u32 prepareTexture(); // return type may be wrong virtual void append(const ResTIMG*, f32); virtual void append(const ResTIMG*, JUTPalette*, f32); virtual void append(const char*, f32); @@ -31,11 +31,11 @@ public: virtual void remove(u8); virtual void remove(void); virtual void remove(JUTTexture*); - virtual void draw(f32,f32,bool,bool,bool); - virtual void draw(f32,f32,u8,bool,bool,bool); - virtual void draw(f32,f32,f32,f32,bool,bool,bool); - virtual void drawOut(f32,f32,f32,f32,f32,f32); - virtual void drawOut(f32,f32,f32,f32,f32,f32,f32,f32); + virtual void draw(f32, f32, bool, bool, bool); + virtual void draw(f32, f32, u8, bool, bool, bool); + virtual void draw(f32, f32, f32, f32, bool, bool, bool); + virtual void drawOut(f32, f32, f32, f32, f32, f32); + virtual void drawOut(f32, f32, f32, f32, f32, f32, f32, f32); virtual void drawOut(const JGeometry::TBox2&, const JGeometry::TBox2&); virtual void load(_GXTexMapID, u8); virtual void load(u8); diff --git a/include/f/f_op/f_op_msg_mng.h b/include/f/f_op/f_op_msg_mng.h index f5f16d7716f..e9c0a1723b1 100644 --- a/include/f/f_op/f_op_msg_mng.h +++ b/include/f/f_op/f_op_msg_mng.h @@ -1,9 +1,9 @@ #ifndef F_F_OP_MSG_MNG_H_ #define F_F_OP_MSG_MNG_H_ -#include "dolphin/types.h" -#include "f/f_op/f_op_actor.h" #include "JSystem/J2DGraph/J2DPane.h" #include "JSystem/J2DGraph/J2DPicture/J2DPicture.h" +#include "dolphin/types.h" +#include "f/f_op/f_op_actor.h" #endif \ No newline at end of file diff --git a/src/f/f_op/f_op_draw_iter.cpp b/src/f/f_op/f_op_draw_iter.cpp index 61c4b9612fe..36c1d5408c4 100644 --- a/src/f/f_op/f_op_draw_iter.cpp +++ b/src/f/f_op/f_op_draw_iter.cpp @@ -1,8 +1,8 @@ /* f_op_draw_iter.cpp autogenerated by split.py v0.4 at 2021-02-15 20:16:49.147351 */ #include "f/f_op/f_op_draw_iter.h" -#include "SComponent/c_tree.h" #include "SComponent/c_tag.h" +#include "SComponent/c_tree.h" #include "global.h" // additional symbols needed for f_op_draw_iter.cpp diff --git a/src/f/f_op/f_op_draw_tag.cpp b/src/f/f_op/f_op_draw_tag.cpp index 3c0a4246674..8c0fd4058ab 100644 --- a/src/f/f_op/f_op_draw_tag.cpp +++ b/src/f/f_op/f_op_draw_tag.cpp @@ -9,7 +9,7 @@ extern node_list_class lists; extern node_lists_tree_class g_fopDwTg_Queue; void fopDwTg_ToDrawQ(create_tag_class* pCreateTagClass, int priority) { - cTg_AdditionToTree(&g_fopDwTg_Queue,priority,pCreateTagClass); + cTg_AdditionToTree(&g_fopDwTg_Queue, priority, pCreateTagClass); } void fopDwTg_DrawQTo(create_tag_class* pCreateTagClass) { @@ -17,10 +17,10 @@ void fopDwTg_DrawQTo(create_tag_class* pCreateTagClass) { } bool fopDwTg_Init(create_tag_class* pCreateTagClass, void* pActor) { - cTg_Create(pCreateTagClass,pActor); + cTg_Create(pCreateTagClass, pActor); return true; } void fopDwTg_CreateQueue(void) { - cTr_Create(&g_fopDwTg_Queue,&lists,1000); + cTr_Create(&g_fopDwTg_Queue, &lists, 1000); } \ No newline at end of file diff --git a/src/f/f_op/f_op_kankyo.cpp b/src/f/f_op/f_op_kankyo.cpp index c96f37545fb..e194b810859 100644 --- a/src/f/f_op/f_op_kankyo.cpp +++ b/src/f/f_op/f_op_kankyo.cpp @@ -43,7 +43,7 @@ struct unk { void fopKy_Draw(void* i_pUserData) { unk* pMtd = (unk*)i_pUserData; if (!g_dComIfG_gameInfo.getPlay().getField0x4f7d()) { - fpcLf_DrawMethod(pMtd->mpDrawMtd,i_pUserData); + fpcLf_DrawMethod(pMtd->mpDrawMtd, i_pUserData); } } #else diff --git a/src/f/f_op/f_op_msg_mng.cpp b/src/f/f_op/f_op_msg_mng.cpp index 4bf65dd9127..df430081778 100644 --- a/src/f/f_op/f_op_msg_mng.cpp +++ b/src/f/f_op/f_op_msg_mng.cpp @@ -1,12 +1,12 @@ /* f_op_msg_mng.cpp autogenerated by split.py v0.4 at 2021-02-15 20:21:51.945184 */ +#include "f/f_op/f_op_msg_mng.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "f/f_op/f_op_scene_iter.h" -#include "f/f_pc/f_pc_stdcreate_req.h" -#include "f/f_op/f_op_msg_mng.h" #include "f/f_pc/f_pc_manager.h" -#include "m_Do/m_Do_ext/m_Do_ext.h" +#include "f/f_pc/f_pc_stdcreate_req.h" #include "global.h" +#include "m_Do/m_Do_ext/m_Do_ext.h" // additional symbols needed for f_op_msg_mng.cpp // autogenerated by split.py v0.4 at 2021-02-15 20:21:51.945228 @@ -82,8 +82,7 @@ asm void fopMsgM_setStageLayer(void*) { // fopMsgM_SearchByID__FUi // fopMsgM_SearchByID__FUi(unsigned int) -asm void fopMsgM_SearchByID(unsigned int) { - nofralloc +asm void fopMsgM_SearchByID(unsigned int){nofralloc #include "f/f_op/f_op_msg_mng/asm/func_8001FA24.s" } @@ -99,7 +98,7 @@ u32 fopMsgM_GetAppend(void* pProc) { // fopMsgM_Delete__FPv // fopMsgM_Delete__FPv(void*) -void fopMsgM_Delete(void* pProc) { +void fopMsgM_Delete(void* pProc) { fpcM_Delete(pProc); } @@ -118,7 +117,8 @@ asm void createTimerAppend(int, u32, u8, u8, f32, f32, f32, f32, unsigned int) { } // fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i -// fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i(s16, fopAc_ac_c*, cXyz*, u32*, u32*, int (*)(void*)) +// fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i(s16, fopAc_ac_c*, cXyz*, u32*, u32*, int +// (*)(void*)) asm void fopMsgM_create(s16, fopAc_ac_c*, cXyz*, u32*, u32*, int (*)(void*)) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_8001FC4C.s" @@ -186,24 +186,24 @@ asm void fopMsgM_valueIncrease(int, int, u8) { } void J2DPicture::setBlendRatio(f32 param_1, f32 param_2) { - setBlendColorRatio(param_1,param_2); - setBlendAlphaRatio(param_1,param_2); + setBlendColorRatio(param_1, param_2); + setBlendAlphaRatio(param_1, param_2); } void J2DPicture::append(const char* param_1, f32 param_2) { - insert(param_1,field_0x08,param_2); + insert(param_1, field_0x08, param_2); } void J2DPicture::insert(const char* param_1, u8 param_2, f32 param_3) { - insert(param_1,0,param_2,param_3); + insert(param_1, 0, param_2, param_3); } void fopMsgM_createExpHeap(u32 param_1, JKRHeap* pJKRHeap) { if (!pJKRHeap) { - pJKRHeap = mDoExt_getGameHeap__Fv(); // fix this in header later + pJKRHeap = mDoExt_getGameHeap__Fv(); // fix this in header later } - JKRExpHeap::create(param_1,pJKRHeap, false); + JKRExpHeap::create(param_1, pJKRHeap, false); } void fopMsgM_destroyExpHeap(JKRExpHeap* pJKRExpHeap) {