Skip to content

Commit 69ad268

Browse files
IsaacMarovitzIsaacMarovitz
committed
Delete Unleashed specific headers
Signed-off-by: Isaac Marovitz <isaacryu@icloud.com>
1 parent c2aec78 commit 69ad268

159 files changed

Lines changed: 2687 additions & 6496 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎MarathonRecomp/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ endfunction()
532532

533533
generate_aggregate_header(
534534
"${CMAKE_CURRENT_SOURCE_DIR}/api"
535-
"${CMAKE_CURRENT_SOURCE_DIR}/api/SWA.h"
535+
"${CMAKE_CURRENT_SOURCE_DIR}/api/Marathon.h"
536536
)
537537

538538
set(RESOURCES_SOURCE_PATH "${PROJECT_SOURCE_DIR}/../MarathonRecompResources")

‎MarathonRecomp/api/CSD/Manager/csdmMotionPattern.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include <SWA.inl>
3+
#include <Marathon.inl>
44

55
namespace Chao::CSD
66
{

‎MarathonRecomp/api/CSD/Manager/csdmNode.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
#pragma once
22

3-
#include <SWA.inl>
3+
#include <Marathon.inl>
44
#include <CSD/Manager/csdmBase.h>
55
#include <CSD/Manager/csdmResourceBase.h>
66
#include <CSD/Manager/csdmNodeObserver.h>
77
#include <CSD/Manager/csdmSubjectBase.h>
8-
#include <Hedgehog/Math/Vector.h>
98

109
namespace Chao::CSD
1110
{
@@ -14,15 +13,14 @@ namespace Chao::CSD
1413
class CNode : public CResourceBase<Node>, SubjectBase<CNodeObserver, CNode>, CBase
1514
{
1615
public:
17-
SWA_INSERT_PADDING(0x34);
16+
MARATHON_INSERT_PADDING(0x34);
1817
xpointer<CMotionPattern> m_pMotionPattern;
19-
SWA_INSERT_PADDING(0x18);
18+
MARATHON_INSERT_PADDING(0x18);
2019

2120
~CNode();
2221

2322
void SetText(const char* in_pText);
2423
void SetText(const wchar_t* in_pText);
25-
void GetPosition(Hedgehog::Math::CVector2& out_rResult) const;
2624
void SetPosition(float in_X, float in_Y);
2725
void SetHideFlag(uint32_t in_HideFlag);
2826
void SetRotation(float in_Rotation);

‎MarathonRecomp/api/CSD/Manager/csdmNode.inl‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#include "SWA.inl"
1+
#include "Marathon.inl"
22

33
namespace Chao::CSD
44
{
55
inline CNode::~CNode()
66
{
7-
SWA_VIRTUAL_FUNCTION(void, 0, this);
7+
MARATHON_VIRTUAL_FUNCTION(void, 0, this);
88
}
99

1010
inline void CNode::SetText(const char* in_pText)
@@ -17,11 +17,6 @@ namespace Chao::CSD
1717
// GuestToHostFunction<int>(sub_830BF640, this, in_pText);
1818
}
1919

20-
inline void CNode::GetPosition(Hedgehog::Math::CVector2& out_rResult) const
21-
{
22-
// GuestToHostFunction<void>(sub_830BF008, &out_rResult, this);
23-
}
24-
2520
inline void CNode::SetPosition(float in_X, float in_Y)
2621
{
2722
// GuestToHostFunction<int>(sub_830BF078, this, in_X, in_Y);

‎MarathonRecomp/api/CSD/Manager/csdmObserverBase.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "SWA.inl"
3+
#include "Marathon.inl"
44

55
namespace Chao::CSD
66
{
@@ -14,7 +14,7 @@ namespace Chao::CSD
1414
};
1515

1616
xpointer<Vftable> m_pVftable;
17-
SWA_INSERT_PADDING(0x08);
17+
MARATHON_INSERT_PADDING(0x08);
1818

1919
~CObserverBase();
2020
};

‎MarathonRecomp/api/CSD/Manager/csdmProject.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "SWA.inl"
3+
#include "Marathon.inl"
44
#include "CSD/Manager/csdmBase.h"
55
#include "CSD/Manager/csdmResourceBase.h"
66

@@ -14,9 +14,9 @@ namespace Chao::CSD
1414
class CProject : public CResourceBase<Project>, CBase
1515
{
1616
public:
17-
SWA_INSERT_PADDING(0x1C);
17+
MARATHON_INSERT_PADDING(0x1C);
1818
RCPtr<CTexList> m_rcTexList;
19-
SWA_INSERT_PADDING(0x1C);
19+
MARATHON_INSERT_PADDING(0x1C);
2020

2121
RCPtr<CScene> CreateScene(const char* in_pName) const;
2222
RCPtr<CScene> CreateScene(const char* in_pName, const char* in_pMotionName) const;

‎MarathonRecomp/api/CSD/Manager/csdmRCPtrAbs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "SWA.inl"
3+
#include "Marathon.inl"
44

55
namespace Chao::CSD
66
{

‎MarathonRecomp/api/CSD/Manager/csdmScene.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "SWA.inl"
3+
#include "Marathon.inl"
44
#include "CSD/Manager/csdmBase.h"
55
#include "CSD/Manager/csdmResourceBase.h"
66
#include "CSD/Manager/csdmSceneObserver.h"
@@ -23,17 +23,17 @@ namespace Chao::CSD
2323
class CScene : public CResourceBase<Scene>, SubjectBase<CSceneObserver, CScene>, CBase
2424
{
2525
public:
26-
SWA_INSERT_PADDING(0x60);
26+
MARATHON_INSERT_PADDING(0x60);
2727
be<float> m_PrevMotionFrame;
2828
be<float> m_MotionFrame;
2929
be<float> m_MotionSpeed;
3030
be<float> m_MotionStartFrame;
3131
be<float> m_MotionEndFrame;
32-
SWA_INSERT_PADDING(0x0C);
32+
MARATHON_INSERT_PADDING(0x0C);
3333
be<uint32_t> m_MotionDisableFlag;
34-
SWA_INSERT_PADDING(0x10);
34+
MARATHON_INSERT_PADDING(0x10);
3535
be<EMotionRepeatType> m_MotionRepeatType;
36-
SWA_INSERT_PADDING(0x2C);
36+
MARATHON_INSERT_PADDING(0x2C);
3737

3838
~CScene();
3939
void Update(float in_DeltaTime = 0.0f);

‎MarathonRecomp/api/CSD/Manager/csdmScene.inl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ namespace Chao::CSD
22
{
33
inline CScene::~CScene()
44
{
5-
SWA_VIRTUAL_FUNCTION(void, 0, this);
5+
MARATHON_VIRTUAL_FUNCTION(void, 0, this);
66
}
77

88
inline void CScene::Update(float in_DeltaTime)
99
{
10-
SWA_VIRTUAL_FUNCTION(void, 2, this, in_DeltaTime);
10+
MARATHON_VIRTUAL_FUNCTION(void, 2, this, in_DeltaTime);
1111
}
1212

1313
inline void CScene::Render(void* in_pUnk)
1414
{
15-
SWA_VIRTUAL_FUNCTION(void, 3, this, in_pUnk);
15+
MARATHON_VIRTUAL_FUNCTION(void, 3, this, in_pUnk);
1616
}
1717

1818
inline void CScene::GetNode(RCPtr<CNode>& out_rResult, const char* in_pName)

‎MarathonRecomp/api/CSD/Manager/csdmSubjectBase.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "SWA.inl"
3+
#include "Marathon.inl"
44

55
namespace Chao::CSD
66
{
@@ -15,7 +15,7 @@ namespace Chao::CSD
1515
};
1616

1717
xpointer<Vftable> m_pVftable;
18-
SWA_INSERT_PADDING(0x0C);
18+
MARATHON_INSERT_PADDING(0x0C);
1919

2020
~SubjectBase();
2121
TObservee* GetObservee() const;

0 commit comments

Comments
 (0)