Fix formatting

This commit is contained in:
Hyper 2025-03-09 01:10:03 +00:00
parent 1c44c99572
commit 0df08570bb
5 changed files with 38 additions and 27 deletions

View file

@ -1,22 +1,25 @@
#pragma once #pragma once
#include <SWA.inl> #include <SWA.inl>
namespace SWA::Sequence::Core namespace SWA::Sequence::Core
{ {
class IManager : public Hedgehog::Base::CSynchronizedObject class IManager : public Hedgehog::Base::CSynchronizedObject
{ {
public: public:
int test; be<uint32_t> m_Field00;
}; };
class CManager : public IManager, public Hedgehog::Universe::CMessageActor class CManager : public IManager, public Hedgehog::Universe::CMessageActor
{ {
public: public:
SWA_INSERT_PADDING(0x6); SWA_INSERT_PADDING(0x06);
boost::shared_ptr<void> m_Field9c; boost::shared_ptr<void> m_Field9C;
xpointer<void> m_FieldA4; xpointer<void> m_FieldA4;
boost::shared_ptr<void> m_FieldA8; boost::shared_ptr<void> m_FieldA8;
xpointer<void> dwordB0; xpointer<void> m_FieldB0;
int m_FieldB4; be<uint32_t> m_FieldB4;
int m_FieldB8; be<uint32_t> m_FieldB8;
Hedgehog::Base::CSharedString m_FieldBC; Hedgehog::Base::CSharedString m_FieldBC;
Hedgehog::Base::CSharedString m_FieldC0; Hedgehog::Base::CSharedString m_FieldC0;
SWA_INSERT_PADDING(0x4C); SWA_INSERT_PADDING(0x4C);
@ -27,9 +30,10 @@ namespace SWA::Sequence::Core
bool m_Field114; bool m_Field114;
bool m_Field115; bool m_Field115;
}; };
SWA_ASSERT_OFFSETOF(CManager, m_Field9c, 0x9C);
SWA_ASSERT_OFFSETOF(CManager, m_Field9C, 0x9C);
SWA_ASSERT_OFFSETOF(CManager, m_FieldA4, 0xA4); SWA_ASSERT_OFFSETOF(CManager, m_FieldA4, 0xA4);
SWA_ASSERT_OFFSETOF(CManager, dwordB0, 0xB0); SWA_ASSERT_OFFSETOF(CManager, m_FieldB0, 0xB0);
SWA_ASSERT_OFFSETOF(CManager, m_FieldBC, 0xBC); SWA_ASSERT_OFFSETOF(CManager, m_FieldBC, 0xBC);
SWA_ASSERT_OFFSETOF(CManager, m_Field115, 0x115); SWA_ASSERT_OFFSETOF(CManager, m_Field115, 0x115);
}; };

View file

@ -84,35 +84,35 @@ namespace SWA
xpointer<CApplication> m_pApplication; xpointer<CApplication> m_pApplication;
boost::shared_ptr<Hedgehog::Universe::CParallelJobManagerD3D9> m_spParallelJobManagerD3D9; boost::shared_ptr<Hedgehog::Universe::CParallelJobManagerD3D9> m_spParallelJobManagerD3D9;
xpointer<Hedgehog::Universe::CMessageManager> m_pMessageManager; xpointer<Hedgehog::Universe::CMessageManager> m_pMessageManager;
SWA_INSERT_PADDING(0x8); SWA_INSERT_PADDING(0x08);
boost::shared_ptr<Hedgehog::Universe::CUpdateManager> m_spUpdateManager; boost::shared_ptr<Hedgehog::Universe::CUpdateManager> m_spUpdateManager;
xpointer<CGame> m_pGame; xpointer<CGame> m_pGame;
SWA_INSERT_PADDING(0x4); SWA_INSERT_PADDING(0x04);
boost::shared_ptr<Hedgehog::Mirage::CRenderingDevice> m_spRenderingDevice; boost::shared_ptr<Hedgehog::Mirage::CRenderingDevice> m_spRenderingDevice;
SWA_INSERT_PADDING(0xC); SWA_INSERT_PADDING(0x0C);
boost::shared_ptr<Hedgehog::Database::CDatabase> m_spInspireDatabase; boost::shared_ptr<Hedgehog::Database::CDatabase> m_spInspireDatabase;
boost::anonymous_shared_ptr m_spField44; boost::anonymous_shared_ptr m_spField44;
SWA_INSERT_PADDING(0x28); SWA_INSERT_PADDING(0x28);
Hedgehog::Base::CSharedString m_Field74; Hedgehog::Base::CSharedString m_Field74;
SWA_INSERT_PADDING(0xC); SWA_INSERT_PADDING(0x0C);
boost::shared_ptr<Hedgehog::Mirage::CMatrixNode> m_spMatrixNodeRoot; boost::shared_ptr<Hedgehog::Mirage::CMatrixNode> m_spMatrixNodeRoot;
xpointer<void> m_pFlagManager; xpointer<void> m_pFlagManager;
xpointer<void> m_pField8C; xpointer<void> m_pField8C;
boost::shared_ptr<CReplayManager> m_spReplayManager; boost::shared_ptr<CReplayManager> m_spReplayManager;
SWA_INSERT_PADDING(0x4); SWA_INSERT_PADDING(0x04);
CGammaController m_GammaController; CGammaController m_GammaController;
boost::shared_ptr<CLoading> m_spLoading; boost::shared_ptr<CLoading> m_spLoading;
boost::shared_ptr<CSaveIcon> m_spSaveIcon; boost::shared_ptr<CSaveIcon> m_spSaveIcon;
SWA_INSERT_PADDING(0x4); SWA_INSERT_PADDING(0x04);
boost::shared_ptr<Sequence::Core::CManager> m_spSequenceCore; boost::shared_ptr<Sequence::Core::CManager> m_spSequenceCore;
xpointer<Achievement::CManager> m_pAchievementManager; xpointer<Achievement::CManager> m_pAchievementManager;
SWA_INSERT_PADDING(0x4); SWA_INSERT_PADDING(0x04);
boost::shared_ptr<CDatabaseTree> m_spDatabaseTree; boost::shared_ptr<CDatabaseTree> m_spDatabaseTree;
Hedgehog::Base::CSharedString m_Field10C; Hedgehog::Base::CSharedString m_Field10C;
SWA_INSERT_PADDING(0x20); SWA_INSERT_PADDING(0x20);
boost::shared_ptr<Hedgehog::Mirage::CRenderScene> m_spRenderScene; boost::shared_ptr<Hedgehog::Mirage::CRenderScene> m_spRenderScene;
boost::shared_ptr<CGameParameter> m_spGameParameter; boost::shared_ptr<CGameParameter> m_spGameParameter;
SWA_INSERT_PADDING(0xC); SWA_INSERT_PADDING(0x0C);
boost::shared_ptr<CItemParamManager> m_spItemParameter; boost::shared_ptr<CItemParamManager> m_spItemParameter;
boost::shared_ptr<CKyojuParamManager> m_spKyojuParameter; boost::shared_ptr<CKyojuParamManager> m_spKyojuParameter;
boost::shared_ptr<CHotdogSaveManager> m_spHotdogSaveManager; boost::shared_ptr<CHotdogSaveManager> m_spHotdogSaveManager;
@ -121,11 +121,11 @@ namespace SWA
boost::shared_ptr<CSkillParamManager> m_spSkillParamManager; boost::shared_ptr<CSkillParamManager> m_spSkillParamManager;
SWA_INSERT_PADDING(0x2C); SWA_INSERT_PADDING(0x2C);
boost::shared_ptr<Hedgehog::Database::CLoadPoolMemory> m_spDatabaseLoadPoolMemory; boost::shared_ptr<Hedgehog::Database::CLoadPoolMemory> m_spDatabaseLoadPoolMemory;
SWA_INSERT_PADDING(0x8); SWA_INSERT_PADDING(0x08);
boost::shared_ptr<Hedgehog::Base::CCriticalSection> m_spCriticalSection; boost::shared_ptr<Hedgehog::Base::CCriticalSection> m_spCriticalSection;
SWA_INSERT_PADDING(0xC); SWA_INSERT_PADDING(0x0C);
boost::shared_ptr<CDLCManager> m_spDLCManager; boost::shared_ptr<CDLCManager> m_spDLCManager;
SWA_INSERT_PADDING(0xC); SWA_INSERT_PADDING(0x0C);
}; };
// TODO: Hedgehog::Base::TSynchronizedPtr<CApplicationDocument> // TODO: Hedgehog::Base::TSynchronizedPtr<CApplicationDocument>
@ -140,9 +140,10 @@ namespace SWA
bool m_InspireSubtitles; bool m_InspireSubtitles;
SWA_INSERT_PADDING(0x28); SWA_INSERT_PADDING(0x28);
}; };
SWA_ASSERT_OFFSETOF(CApplicationDocument::CMember, m_pApplication, 0x00); SWA_ASSERT_OFFSETOF(CApplicationDocument::CMember, m_pApplication, 0x00);
SWA_ASSERT_OFFSETOF(CApplicationDocument::CMember, m_spParallelJobManagerD3D9, 0x04); SWA_ASSERT_OFFSETOF(CApplicationDocument::CMember, m_spParallelJobManagerD3D9, 0x04);
SWA_ASSERT_OFFSETOF(CApplicationDocument::CMember, m_pMessageManager, 0xC); SWA_ASSERT_OFFSETOF(CApplicationDocument::CMember, m_pMessageManager, 0x0C);
SWA_ASSERT_OFFSETOF(CApplicationDocument::CMember, m_spUpdateManager, 0x18); SWA_ASSERT_OFFSETOF(CApplicationDocument::CMember, m_spUpdateManager, 0x18);
SWA_ASSERT_OFFSETOF(CApplicationDocument::CMember, m_pGame, 0x20); SWA_ASSERT_OFFSETOF(CApplicationDocument::CMember, m_pGame, 0x20);
SWA_ASSERT_OFFSETOF(CApplicationDocument::CMember, m_spRenderingDevice, 0x28); SWA_ASSERT_OFFSETOF(CApplicationDocument::CMember, m_spRenderingDevice, 0x28);

View file

@ -4,6 +4,7 @@ namespace Hedgehog::Database
{ {
class CDatabase; class CDatabase;
} }
namespace Hedgehog::Mirage namespace Hedgehog::Mirage
{ {
class CLightFieldManager; class CLightFieldManager;
@ -44,7 +45,7 @@ namespace SWA
boost::shared_ptr<CParameterEditor> m_spParameterEditor; boost::shared_ptr<CParameterEditor> m_spParameterEditor;
boost::shared_ptr<CParameterEditor2nd> m_spParameterEditor2nd; boost::shared_ptr<CParameterEditor2nd> m_spParameterEditor2nd;
SWA_INSERT_PADDING(0x40); SWA_INSERT_PADDING(0x40);
boost::shared_ptr<Hedgehog::Mirage::CLightFieldManager> m_spLightfieldManager; boost::shared_ptr<Hedgehog::Mirage::CLightFieldManager> m_spLightFieldManager;
SWA_INSERT_PADDING(0x10); SWA_INSERT_PADDING(0x10);
Hedgehog::Base::CSharedString m_StageName; Hedgehog::Base::CSharedString m_StageName;
xpointer<CSoundAdministrator> m_pSoundAdministrator; xpointer<CSoundAdministrator> m_pSoundAdministrator;
@ -76,7 +77,7 @@ namespace SWA
SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_spDatabase, 0x1C); SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_spDatabase, 0x1C);
SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_spParameterEditor, 0x44); SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_spParameterEditor, 0x44);
SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_spParameterEditor2nd, 0x4C); SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_spParameterEditor2nd, 0x4C);
SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_spLightfieldManager, 0x94); SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_spLightFieldManager, 0x94);
SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_StageName, 0xAC); SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_StageName, 0xAC);
SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_pSoundAdministrator, 0xB0); SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_pSoundAdministrator, 0xB0);
SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_pGeneralWindow, 0xFC); SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_pGeneralWindow, 0xFC);

View file

@ -8,23 +8,25 @@ namespace SWA
{ {
public: public:
struct SSaveData; struct SSaveData;
struct SStageParameter struct SStageParameter
{ {
hh::map<int, int> Field00; hh::map<int, int> Field00;
xpointer<void> FieldC; xpointer<void> Field0C;
xpointer<void> Field10; xpointer<void> Field10;
xpointer<void> Field14; xpointer<void> Field14;
xpointer<void> Field18; xpointer<void> Field18;
int Field1C; be<uint32_t> Field1C;
char Field20; uint8_t Field20;
}; };
SWA_INSERT_PADDING(0x94); SWA_INSERT_PADDING(0x94);
xpointer<SSaveData> m_pSaveData; xpointer<SSaveData> m_pSaveData;
xpointer<SStageParameter> m_pStageParameter; xpointer<SStageParameter> m_pStageParameter;
}; };
SWA_ASSERT_OFFSETOF(CGameParameter::SStageParameter, Field00, 0x00); SWA_ASSERT_OFFSETOF(CGameParameter::SStageParameter, Field00, 0x00);
SWA_ASSERT_OFFSETOF(CGameParameter::SStageParameter, FieldC, 0x0C); SWA_ASSERT_OFFSETOF(CGameParameter::SStageParameter, Field0C, 0x0C);
SWA_ASSERT_OFFSETOF(CGameParameter::SStageParameter, Field10, 0x10); SWA_ASSERT_OFFSETOF(CGameParameter::SStageParameter, Field10, 0x10);
SWA_ASSERT_OFFSETOF(CGameParameter::SStageParameter, Field14, 0x14); SWA_ASSERT_OFFSETOF(CGameParameter::SStageParameter, Field14, 0x14);
SWA_ASSERT_OFFSETOF(CGameParameter::SStageParameter, Field18, 0x18); SWA_ASSERT_OFFSETOF(CGameParameter::SStageParameter, Field18, 0x18);

View file

@ -1,16 +1,19 @@
#pragma once #pragma once
#include <SWA/System/GameObject.h> #include <SWA/System/GameObject.h>
namespace SWA namespace SWA
{ {
class CGlobalParameterManager; class CGlobalParameterManager;
class CParameterEditorWindow; class CParameterEditorWindow;
class CParameterEditor2nd : public SWA::CGameObject //Hedgehog::Mirage::CRenderable, Hedgehog::Universe::TStateMachine<SWA::CParameterEditor2nd> class CParameterEditor2nd : public SWA::CGameObject // public Hedgehog::Mirage::CRenderable, public Hedgehog::Universe::TStateMachine<SWA::CParameterEditor2nd>
{ {
public: public:
SWA_INSERT_PADDING(0x74); SWA_INSERT_PADDING(0x74);
boost::shared_ptr<CGlobalParameterManager> m_spGlobalParameterManager; boost::shared_ptr<CGlobalParameterManager> m_spGlobalParameterManager;
boost::shared_ptr<CParameterEditorWindow> m_spWindow; boost::shared_ptr<CParameterEditorWindow> m_spWindow;
}; };
SWA_ASSERT_OFFSETOF(CParameterEditor2nd, m_spGlobalParameterManager, 0x130); SWA_ASSERT_OFFSETOF(CParameterEditor2nd, m_spGlobalParameterManager, 0x130);
} }