Skip to content

Commit

Permalink
Fix indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
CelestialAmber committed Oct 5, 2024
1 parent 29acba4 commit 146ffa0
Show file tree
Hide file tree
Showing 69 changed files with 713 additions and 716 deletions.
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"[cpp]": {
"files.encoding": "utf8"
},
"editor.insertSpaces": false,
"editor.tabSize": 4,
"files.exclude": {
"**/CVS": false,
Expand Down
8 changes: 4 additions & 4 deletions config/jp/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19117,7 +19117,7 @@ CfObject_vtableFunc4__Q22cf11CfObjectEneFv = .text:0x800B0694; // type:function
func_800B069C__Q22cf11CfObjectEneFv = .text:0x800B069C; // type:function size:0x8 scope:global align:4
func_800B06A4 = .text:0x800B06A4; // type:function size:0x24 scope:global align:4
func_800B06C8 = .text:0x800B06C8; // type:function size:0x120 scope:global align:4
func_800B07E8 = .text:0x800B07E8; // type:function size:0x64 scope:global align:4
func_800B07E8__Fv = .text:0x800B07E8; // type:function size:0x64 scope:global align:4
func_800B084C = .text:0x800B084C; // type:function size:0x48 scope:global align:4
func_800B0894 = .text:0x800B0894; // type:function size:0x12C scope:global align:4
__ct__17UnkClass_805764CCFv = .text:0x800B09C0; // type:function size:0xD0 scope:global align:4
Expand Down Expand Up @@ -19326,7 +19326,7 @@ func_800B83AC = .text:0x800B83AC; // type:function size:0x178 scope:global align
func_800B8524 = .text:0x800B8524; // type:function size:0x2D8 scope:global align:4
func_800B87FC = .text:0x800B87FC; // type:function size:0x4 scope:global align:4
func_800B8800 = .text:0x800B8800; // type:function size:0x4 scope:global align:4
func_800B8804 = .text:0x800B8804; // type:function size:0xDC scope:global align:4
func_800B8804__FPvPQ22cf13IFactoryEvent = .text:0x800B8804; // type:function size:0xDC scope:global align:4
func_800B88E0 = .text:0x800B88E0; // type:function size:0x40 scope:global align:4
func_800B8920 = .text:0x800B8920; // type:function size:0xAC scope:global align:4
func_800B89CC = .text:0x800B89CC; // type:function size:0x98 scope:global align:4
Expand Down Expand Up @@ -21772,7 +21772,7 @@ func_8018C258 = .text:0x8018C258; // type:function size:0x344 scope:global align
func_8018C59C = .text:0x8018C59C; // type:function size:0x50 scope:global align:4
func_8018C5EC = .text:0x8018C5EC; // type:function size:0x8 scope:global align:4
func_8018C5F4 = .text:0x8018C5F4; // type:function size:0x8 scope:global align:4
func_8018C5FC = .text:0x8018C5FC; // type:function size:0x14 scope:global align:4
__ct__Q22cf17UnkClass_8018C5FCFv = .text:0x8018C5FC; // type:function size:0x14 scope:global align:4
func_8018C610 = .text:0x8018C610; // type:function size:0x210 scope:global align:4
func_8018C820 = .text:0x8018C820; // type:function size:0xD4 scope:global align:4
func_8018C8F4 = .text:0x8018C8F4; // type:function size:0xD0 scope:global align:4
Expand Down Expand Up @@ -21862,7 +21862,7 @@ __ct__CMenuPTState = .text:0x80192AB8; // type:function size:0x118 scope:global
func_80192BD0 = .text:0x80192BD0; // type:function size:0x14 scope:global align:4
func_80192BE4 = .text:0x80192BE4; // type:function size:0x8 scope:global align:4
func_80192BEC = .text:0x80192BEC; // type:function size:0x8 scope:global align:4
__ct__80192BF4 = .text:0x80192BF4; // type:function size:0x1C scope:global align:4
__ct__Q22cf17UnkClass_80192BF4Fv = .text:0x80192BF4; // type:function size:0x1C scope:global align:4
__ct__80192C10 = .text:0x80192C10; // type:function size:0x1C scope:global align:4
func_80192C2C = .text:0x80192C2C; // type:function size:0x84 scope:global align:4
func_80192CB0 = .text:0x80192CB0; // type:function size:0x138 scope:global align:4
Expand Down
18 changes: 9 additions & 9 deletions libs/monolib/include/monolib/CArcItem.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

class CArcItem : IWorkEvent {
public:
CArcItem(int param);
virtual ~CArcItem();
virtual bool OnFileEvent();
CArcItem(int param);
virtual ~CArcItem();
virtual bool OnFileEvent();

int unk4;
u8 unk8[0x24 - 0x8];
void* unk24;
char* unk28;
int unk2C;
u8 unk30;
int unk4;
u8 unk8[0x24 - 0x8];
void* unk24;
char* unk28;
int unk2C;
u8 unk30;
};
32 changes: 16 additions & 16 deletions libs/monolib/include/monolib/CAttrTransform.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@

namespace ml{
struct CAttrTransform{
CVec3 vec1; //0x0
CVec3 mRotation; //0xC
CMat34 mMtx1; //0x18
CMat34 mMtx2; //0x48
CMat34 mMtx3; //0x78
CQuat unkA8;
CVec3 unkB8;
CVec3 unkC4;
CQuat unkD0;
u32 mFlags; //0xE0
CVec3 vec1; //0x0
CVec3 mRotation; //0xC
CMat34 mMtx1; //0x18
CMat34 mMtx2; //0x48
CMat34 mMtx3; //0x78
CQuat unkA8;
CVec3 unkB8;
CVec3 unkC4;
CQuat unkD0;
u32 mFlags; //0xE0

CAttrTransform(){
clear();
}
CAttrTransform(){
clear();
}

void clear();
void update();
};
void clear();
void update();
};
}
34 changes: 17 additions & 17 deletions libs/monolib/include/monolib/CChildListNode.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@
template <typename T>
class TChildListHeader : public CDoubleListHeader {
private:
char unk8[0x10 - 0x8];
char unk8[0x10 - 0x8];

public:
TChildListHeader() { Reset(); }
virtual ~TChildListHeader() {}
void Reset() { mHead = NULL; }
TChildListHeader() { Reset(); }
virtual ~TChildListHeader() {}
void Reset() { mHead = NULL; }

T* Front() const { return static_cast<T*>(Head()); }
T* Back() const {
return Head() != NULL ? static_cast<T*>(mHead->GetPrev()) : NULL;
}
T* Front() const { return static_cast<T*>(Head()); }
T* Back() const {
return Head() != NULL ? static_cast<T*>(mHead->GetPrev()) : NULL;
}
};

class CChildListNode : public CDoubleListNode {
public:
CChildListNode();
virtual ~CChildListNode() {}
virtual void Reset();
CChildListNode();
virtual ~CChildListNode() {}
virtual void Reset();

CChildListNode* GetParent() const { return parent; }
void SetParent(CChildListNode* newParent) { parent = newParent; }
CChildListNode* GetParent() const { return parent; }
void SetParent(CChildListNode* newParent) { parent = newParent; }

private:
CChildListNode* parent; //0x14
char unk18[0x24 - 0x18];
TChildListHeader<CChildListNode> children; //0x24
CChildListNode* parent; //0x14
char unk18[0x24 - 0x18];
TChildListHeader<CChildListNode> children; //0x24
};
36 changes: 18 additions & 18 deletions libs/monolib/include/monolib/CDoubleListNode.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,32 @@

class CDoubleListNode {
public:
CDoubleListNode* mNext; //0x0
CDoubleListNode* mPrev; //0x4
u8 unk8;
int unkC;
CDoubleListNode* mNext; //0x0
CDoubleListNode* mPrev; //0x4
u8 unk8;
int unkC;

public:
CDoubleListNode();
virtual ~CDoubleListNode() {}
virtual void Reset();
CDoubleListNode();
virtual ~CDoubleListNode() {}
virtual void Reset();

CDoubleListNode* GetNext() const { return mNext; }
CDoubleListNode* GetPrev() const { return mPrev; }
void SetNext(CDoubleListNode* newNext) { mNext = newNext; }
void SetPrev(CDoubleListNode* newPrev) { mPrev = newPrev; }
CDoubleListNode* GetNext() const { return mNext; }
CDoubleListNode* GetPrev() const { return mPrev; }
void SetNext(CDoubleListNode* newNext) { mNext = newNext; }
void SetPrev(CDoubleListNode* newPrev) { mPrev = newPrev; }
};

class CDoubleListHeader {
protected:
CDoubleListNode* mHead; //0x0
CDoubleListNode* mTail; //0x4
CDoubleListNode* mHead; //0x0
CDoubleListNode* mTail; //0x4

public:
CDoubleListNode* Head() const { return mHead; }
CDoubleListNode* Tail() const { return mTail; }
CDoubleListNode* Head() const { return mHead; }
CDoubleListNode* Tail() const { return mTail; }

CDoubleListNode* InsertTop(CDoubleListNode* node);
CDoubleListNode* InsertEnd(CDoubleListNode* node);
CDoubleListNode* Remove(CDoubleListNode* node);
CDoubleListNode* InsertTop(CDoubleListNode* node);
CDoubleListNode* InsertEnd(CDoubleListNode* node);
CDoubleListNode* Remove(CDoubleListNode* node);
};
2 changes: 1 addition & 1 deletion libs/monolib/include/monolib/CMsgParam.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class CMsgParam{
for(int i = 0; i < field4; i++){
if(mArrayPtr[(field3 + i) % mSize].unk0 == 2){
return i;
}
}
}

return -1;
Expand Down
10 changes: 5 additions & 5 deletions libs/monolib/include/monolib/CProcess.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

class CProcess : CChildListNode {
public:
CProcess();
virtual void vtableFunc1();
virtual void vtableFunc2();
virtual void vtableFunc3();
virtual void vtableFunc4();
CProcess();
virtual void vtableFunc1();
virtual void vtableFunc2();
virtual void vtableFunc3();
virtual void vtableFunc4();
};
2 changes: 1 addition & 1 deletion libs/monolib/include/monolib/CTTask.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
template <typename T>
class CTTask : CProcess {
public:
CTTask(){}
CTTask(){}
};
8 changes: 4 additions & 4 deletions libs/monolib/include/monolib/CWorkThread.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ class CWorkThread : public IWorkEvent {
void func_80438BD8(CWorkThread* r4, u32 r5);
u32 func_80457CA4(UNKTYPE* r4, u32 r5);

inline bool CWorkThread_inline1() const {
bool r0_1 = (unk7C & 0x10) ? true : (unk80.someInline() >= 0);
return (!r0_1 && (unk48 == 2 || unk48 == 3));
}
inline bool CWorkThread_inline1() const {
bool r0_1 = (unk7C & 0x10) ? true : (unk80.someInline() >= 0);
return (!r0_1 && (unk48 == 2 || unk48 == 3));
}

//0x0: vtable
FixStr<64> mName; //0x4
Expand Down
2 changes: 1 addition & 1 deletion libs/monolib/include/monolib/FastCast.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once

namespace ml{
void initFastCast();
void initFastCast();
}
64 changes: 32 additions & 32 deletions libs/monolib/include/monolib/IWorkEvent.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,36 @@ class CEventFile {
//Interface for work events, which most classes that do any types of tasks seem to inherit.
class IWorkEvent {
public:
virtual ~IWorkEvent(){}
virtual bool WorkEvent1(){ return false; }
virtual bool OnFileEvent(CEventFile* pEventFile){ return false; }
virtual bool WorkEvent3(){ return false; }
virtual bool WorkEvent4(){ return false; }
virtual void WorkEvent5(UNKTYPE* r4){}
virtual bool WorkEvent6(){ return false; }
virtual bool WorkEvent7(){ return false; }
virtual bool WorkEvent8(){ return false; }
virtual bool WorkEvent9(){ return false; }
virtual bool WorkEvent10(){ return false; }
virtual bool WorkEvent11(){ return false; }
virtual bool WorkEvent12(){ return false; }
virtual bool WorkEvent13(){ return false; }
virtual bool WorkEvent14(){ return false; }
virtual bool WorkEvent15(){ return false; }
virtual bool WorkEvent16(){ return false; }
virtual bool WorkEvent17(){ return false; }
virtual bool WorkEvent18(){ return false; }
virtual bool WorkEvent19(){ return false; }
virtual bool WorkEvent20(){ return false; }
virtual bool WorkEvent21(){ return false; }
virtual bool WorkEvent22(){ return false; }
virtual bool WorkEvent23(){ return false; }
virtual bool WorkEvent24(){ return false; }
virtual bool WorkEvent25(){ return false; }
virtual bool WorkEvent26(){ return false; }
virtual bool WorkEvent27(){ return false; }
virtual bool WorkEvent28(){ return false; }
virtual bool WorkEvent29(){ return false; }
virtual bool WorkEvent30(){ return false; }
virtual void WorkEvent31(){}
virtual ~IWorkEvent(){}
virtual bool WorkEvent1(){ return false; }
virtual bool OnFileEvent(CEventFile* pEventFile){ return false; }
virtual bool WorkEvent3(){ return false; }
virtual bool WorkEvent4(){ return false; }
virtual void WorkEvent5(UNKTYPE* r4){}
virtual bool WorkEvent6(){ return false; }
virtual bool WorkEvent7(){ return false; }
virtual bool WorkEvent8(){ return false; }
virtual bool WorkEvent9(){ return false; }
virtual bool WorkEvent10(){ return false; }
virtual bool WorkEvent11(){ return false; }
virtual bool WorkEvent12(){ return false; }
virtual bool WorkEvent13(){ return false; }
virtual bool WorkEvent14(){ return false; }
virtual bool WorkEvent15(){ return false; }
virtual bool WorkEvent16(){ return false; }
virtual bool WorkEvent17(){ return false; }
virtual bool WorkEvent18(){ return false; }
virtual bool WorkEvent19(){ return false; }
virtual bool WorkEvent20(){ return false; }
virtual bool WorkEvent21(){ return false; }
virtual bool WorkEvent22(){ return false; }
virtual bool WorkEvent23(){ return false; }
virtual bool WorkEvent24(){ return false; }
virtual bool WorkEvent25(){ return false; }
virtual bool WorkEvent26(){ return false; }
virtual bool WorkEvent27(){ return false; }
virtual bool WorkEvent28(){ return false; }
virtual bool WorkEvent29(){ return false; }
virtual bool WorkEvent30(){ return false; }
virtual void WorkEvent31(){}
};
Loading

0 comments on commit 146ffa0

Please sign in to comment.