From 0df08570bbebd43699fe6226f43d32f4e72170bd Mon Sep 17 00:00:00 2001 From: Hyper <34012267+hyperbx@users.noreply.github.com> Date: Sun, 9 Mar 2025 01:10:03 +0000 Subject: [PATCH] Fix formatting --- .../api/SWA/Sequence/Core/SequenceManager.h | 20 +++++++++------ .../api/SWA/System/ApplicationDocument.h | 25 ++++++++++--------- UnleashedRecomp/api/SWA/System/GameDocument.h | 5 ++-- .../api/SWA/System/GameParameter.h | 10 +++++--- .../ParameterEditor2nd/ParameterEditor2nd.h | 5 +++- 5 files changed, 38 insertions(+), 27 deletions(-) diff --git a/UnleashedRecomp/api/SWA/Sequence/Core/SequenceManager.h b/UnleashedRecomp/api/SWA/Sequence/Core/SequenceManager.h index 488a104b..dc763501 100644 --- a/UnleashedRecomp/api/SWA/Sequence/Core/SequenceManager.h +++ b/UnleashedRecomp/api/SWA/Sequence/Core/SequenceManager.h @@ -1,22 +1,25 @@ #pragma once + #include + namespace SWA::Sequence::Core { class IManager : public Hedgehog::Base::CSynchronizedObject { public: - int test; + be m_Field00; }; + class CManager : public IManager, public Hedgehog::Universe::CMessageActor { public: - SWA_INSERT_PADDING(0x6); - boost::shared_ptr m_Field9c; + SWA_INSERT_PADDING(0x06); + boost::shared_ptr m_Field9C; xpointer m_FieldA4; boost::shared_ptr m_FieldA8; - xpointer dwordB0; - int m_FieldB4; - int m_FieldB8; + xpointer m_FieldB0; + be m_FieldB4; + be m_FieldB8; Hedgehog::Base::CSharedString m_FieldBC; Hedgehog::Base::CSharedString m_FieldC0; SWA_INSERT_PADDING(0x4C); @@ -27,9 +30,10 @@ namespace SWA::Sequence::Core bool m_Field114; 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, dwordB0, 0xB0); + SWA_ASSERT_OFFSETOF(CManager, m_FieldB0, 0xB0); SWA_ASSERT_OFFSETOF(CManager, m_FieldBC, 0xBC); SWA_ASSERT_OFFSETOF(CManager, m_Field115, 0x115); }; diff --git a/UnleashedRecomp/api/SWA/System/ApplicationDocument.h b/UnleashedRecomp/api/SWA/System/ApplicationDocument.h index bf32f224..7a915b63 100644 --- a/UnleashedRecomp/api/SWA/System/ApplicationDocument.h +++ b/UnleashedRecomp/api/SWA/System/ApplicationDocument.h @@ -84,35 +84,35 @@ namespace SWA xpointer m_pApplication; boost::shared_ptr m_spParallelJobManagerD3D9; xpointer m_pMessageManager; - SWA_INSERT_PADDING(0x8); + SWA_INSERT_PADDING(0x08); boost::shared_ptr m_spUpdateManager; xpointer m_pGame; - SWA_INSERT_PADDING(0x4); + SWA_INSERT_PADDING(0x04); boost::shared_ptr m_spRenderingDevice; - SWA_INSERT_PADDING(0xC); + SWA_INSERT_PADDING(0x0C); boost::shared_ptr m_spInspireDatabase; boost::anonymous_shared_ptr m_spField44; SWA_INSERT_PADDING(0x28); Hedgehog::Base::CSharedString m_Field74; - SWA_INSERT_PADDING(0xC); + SWA_INSERT_PADDING(0x0C); boost::shared_ptr m_spMatrixNodeRoot; xpointer m_pFlagManager; xpointer m_pField8C; boost::shared_ptr m_spReplayManager; - SWA_INSERT_PADDING(0x4); + SWA_INSERT_PADDING(0x04); CGammaController m_GammaController; boost::shared_ptr m_spLoading; boost::shared_ptr m_spSaveIcon; - SWA_INSERT_PADDING(0x4); + SWA_INSERT_PADDING(0x04); boost::shared_ptr m_spSequenceCore; xpointer m_pAchievementManager; - SWA_INSERT_PADDING(0x4); + SWA_INSERT_PADDING(0x04); boost::shared_ptr m_spDatabaseTree; Hedgehog::Base::CSharedString m_Field10C; SWA_INSERT_PADDING(0x20); boost::shared_ptr m_spRenderScene; boost::shared_ptr m_spGameParameter; - SWA_INSERT_PADDING(0xC); + SWA_INSERT_PADDING(0x0C); boost::shared_ptr m_spItemParameter; boost::shared_ptr m_spKyojuParameter; boost::shared_ptr m_spHotdogSaveManager; @@ -121,11 +121,11 @@ namespace SWA boost::shared_ptr m_spSkillParamManager; SWA_INSERT_PADDING(0x2C); boost::shared_ptr m_spDatabaseLoadPoolMemory; - SWA_INSERT_PADDING(0x8); + SWA_INSERT_PADDING(0x08); boost::shared_ptr m_spCriticalSection; - SWA_INSERT_PADDING(0xC); + SWA_INSERT_PADDING(0x0C); boost::shared_ptr m_spDLCManager; - SWA_INSERT_PADDING(0xC); + SWA_INSERT_PADDING(0x0C); }; // TODO: Hedgehog::Base::TSynchronizedPtr @@ -140,9 +140,10 @@ namespace SWA bool m_InspireSubtitles; SWA_INSERT_PADDING(0x28); }; + SWA_ASSERT_OFFSETOF(CApplicationDocument::CMember, m_pApplication, 0x00); 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_pGame, 0x20); SWA_ASSERT_OFFSETOF(CApplicationDocument::CMember, m_spRenderingDevice, 0x28); diff --git a/UnleashedRecomp/api/SWA/System/GameDocument.h b/UnleashedRecomp/api/SWA/System/GameDocument.h index c54ebd9a..c520b4bd 100644 --- a/UnleashedRecomp/api/SWA/System/GameDocument.h +++ b/UnleashedRecomp/api/SWA/System/GameDocument.h @@ -4,6 +4,7 @@ namespace Hedgehog::Database { class CDatabase; } + namespace Hedgehog::Mirage { class CLightFieldManager; @@ -44,7 +45,7 @@ namespace SWA boost::shared_ptr m_spParameterEditor; boost::shared_ptr m_spParameterEditor2nd; SWA_INSERT_PADDING(0x40); - boost::shared_ptr m_spLightfieldManager; + boost::shared_ptr m_spLightFieldManager; SWA_INSERT_PADDING(0x10); Hedgehog::Base::CSharedString m_StageName; xpointer m_pSoundAdministrator; @@ -76,7 +77,7 @@ namespace SWA SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_spDatabase, 0x1C); SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_spParameterEditor, 0x44); 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_pSoundAdministrator, 0xB0); SWA_ASSERT_OFFSETOF(CGameDocument::CMember, m_pGeneralWindow, 0xFC); diff --git a/UnleashedRecomp/api/SWA/System/GameParameter.h b/UnleashedRecomp/api/SWA/System/GameParameter.h index b4e7d6ef..486eb39b 100644 --- a/UnleashedRecomp/api/SWA/System/GameParameter.h +++ b/UnleashedRecomp/api/SWA/System/GameParameter.h @@ -8,23 +8,25 @@ namespace SWA { public: struct SSaveData; + struct SStageParameter { hh::map Field00; - xpointer FieldC; + xpointer Field0C; xpointer Field10; xpointer Field14; xpointer Field18; - int Field1C; - char Field20; + be Field1C; + uint8_t Field20; }; SWA_INSERT_PADDING(0x94); xpointer m_pSaveData; xpointer m_pStageParameter; }; + 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, Field14, 0x14); SWA_ASSERT_OFFSETOF(CGameParameter::SStageParameter, Field18, 0x18); diff --git a/UnleashedRecomp/api/SWA/Tool/ParameterEditor2nd/ParameterEditor2nd.h b/UnleashedRecomp/api/SWA/Tool/ParameterEditor2nd/ParameterEditor2nd.h index 97299df3..e0224c65 100644 --- a/UnleashedRecomp/api/SWA/Tool/ParameterEditor2nd/ParameterEditor2nd.h +++ b/UnleashedRecomp/api/SWA/Tool/ParameterEditor2nd/ParameterEditor2nd.h @@ -1,16 +1,19 @@ #pragma once + #include + namespace SWA { class CGlobalParameterManager; class CParameterEditorWindow; - class CParameterEditor2nd : public SWA::CGameObject //Hedgehog::Mirage::CRenderable, Hedgehog::Universe::TStateMachine + class CParameterEditor2nd : public SWA::CGameObject // public Hedgehog::Mirage::CRenderable, public Hedgehog::Universe::TStateMachine { public: SWA_INSERT_PADDING(0x74); boost::shared_ptr m_spGlobalParameterManager; boost::shared_ptr m_spWindow; }; + SWA_ASSERT_OFFSETOF(CParameterEditor2nd, m_spGlobalParameterManager, 0x130); }