From 6fcdd2e4acedd72811b41c4ba4c8d3583814c531 Mon Sep 17 00:00:00 2001 From: TheRedDaemon <66257843+TheRedDaemon@users.noreply.github.com> Date: Sun, 24 May 2026 21:53:21 +0200 Subject: [PATCH] [PROJECT] update clang-format include formatting --- .clang-format | 20 +++++++++++++++++++ src/OpenSHC/AI/AICState/setFoodBuyPlan.cpp | 4 +++- src/OpenSHC/AI/AIVState/setupAIVMetadata.cpp | 4 +++- .../deactivateSoundFromMenuFuncUnk.cpp | 2 +- .../mss/SoundSystem/endSoundStreamsUnk.cpp | 4 +--- .../SoundSystem/getAndUpdateSampleStatus.cpp | 2 +- .../SoundSystem/isSampleOrStreamPlaying.cpp | 2 +- .../Audio/mss/SoundSystem/meth_0x424700.cpp | 4 +--- .../setStreamAndSampleVolumeUnk.cpp | 2 +- .../Audio/mss/SoundSystem/setVolumeUnk.cpp | 2 +- .../SoundSystem/setupSampleForNextSound.cpp | 2 +- src/OpenSHC/Random/RNG/Constructor_RNG.cpp | 3 +-- src/OpenSHC/Random/RNG/nextRandomNumber1.cpp | 2 +- src/OpenSHC/Random/RNG/nextRandomNumber2.cpp | 2 +- src/OpenSHC/Random/RNG/populateRNG1040.cpp | 4 ++-- src/OpenSHC/Random/RNG/setTimeBasedSeed.cpp | 5 +++-- src/core/Resolver.cpp | 1 - src/precomp/FunctionResolver.h | 2 -- 18 files changed, 42 insertions(+), 25 deletions(-) diff --git a/.clang-format b/.clang-format index 9fb6d82..ae51b08 100644 --- a/.clang-format +++ b/.clang-format @@ -9,4 +9,24 @@ SpaceInEmptyBraces: Never PointerAlignment: Left QualifierAlignment: Custom QualifierOrder: [inline, static, type, const, volatile] +IncludeBlocks: Regroup +IncludeCategories: + - Regex: ^"\.\./.*\.hpp"$ + Priority: 0 + SortPriority: 0 + - Regex: ^"OpenSHC/.*func\.hpp"$ + Priority: 1 + SortPriority: 1 + - Regex: ^"OpenSHC/Globals/.*"$ + Priority: 2 + SortPriority: 3 + - Regex: ^"OpenSHC/.*"$ + Priority: 1 + SortPriority: 2 + - Regex: ^".*"$ + Priority: 3 + SortPriority: 4 + - Regex: .* + Priority: 3 + SortPriority: 5 ... diff --git a/src/OpenSHC/AI/AICState/setFoodBuyPlan.cpp b/src/OpenSHC/AI/AICState/setFoodBuyPlan.cpp index 095c65e..c1221fa 100644 --- a/src/OpenSHC/AI/AICState/setFoodBuyPlan.cpp +++ b/src/OpenSHC/AI/AICState/setFoodBuyPlan.cpp @@ -1,6 +1,8 @@ -#include "OpenSHC/AI/AICState.hpp" +#include "../AICState.func.hpp" + #include "OpenSHC/AI/AITypeA.hpp" #include "OpenSHC/Game/Resources/ResourceType.hpp" + #include "OpenSHC/Globals/DAT_AICState.hpp" #include "OpenSHC/Globals/DAT_GameState.hpp" diff --git a/src/OpenSHC/AI/AIVState/setupAIVMetadata.cpp b/src/OpenSHC/AI/AIVState/setupAIVMetadata.cpp index 02d5f32..35e2b22 100644 --- a/src/OpenSHC/AI/AIVState/setupAIVMetadata.cpp +++ b/src/OpenSHC/AI/AIVState/setupAIVMetadata.cpp @@ -1,5 +1,7 @@ +#include "../AIVState.func.hpp" + #include "OpenSHC/AI/AICState.func.hpp" -#include "OpenSHC/AI/AIVState.hpp" + #include "OpenSHC/Globals/DAT_AICState.hpp" #include "OpenSHC/Globals/DAT_GameState.hpp" diff --git a/src/OpenSHC/Audio/mss/SoundSystem/deactivateSoundFromMenuFuncUnk.cpp b/src/OpenSHC/Audio/mss/SoundSystem/deactivateSoundFromMenuFuncUnk.cpp index b3160ba..8d3ba44 100644 --- a/src/OpenSHC/Audio/mss/SoundSystem/deactivateSoundFromMenuFuncUnk.cpp +++ b/src/OpenSHC/Audio/mss/SoundSystem/deactivateSoundFromMenuFuncUnk.cpp @@ -1,4 +1,4 @@ -#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp" +#include "../SoundSystem.func.hpp" namespace OpenSHC { namespace Audio { diff --git a/src/OpenSHC/Audio/mss/SoundSystem/endSoundStreamsUnk.cpp b/src/OpenSHC/Audio/mss/SoundSystem/endSoundStreamsUnk.cpp index ca8ca81..e575d3d 100644 --- a/src/OpenSHC/Audio/mss/SoundSystem/endSoundStreamsUnk.cpp +++ b/src/OpenSHC/Audio/mss/SoundSystem/endSoundStreamsUnk.cpp @@ -1,6 +1,4 @@ -#include "OpenSHC/Audio/MSS/SoundSystem.hpp" - -#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp" +#include "../SoundSystem.func.hpp" #include "OpenSHC/Audio/MSS/enums/SHC_SoundStream.hpp" diff --git a/src/OpenSHC/Audio/mss/SoundSystem/getAndUpdateSampleStatus.cpp b/src/OpenSHC/Audio/mss/SoundSystem/getAndUpdateSampleStatus.cpp index 9badd2f..691087a 100644 --- a/src/OpenSHC/Audio/mss/SoundSystem/getAndUpdateSampleStatus.cpp +++ b/src/OpenSHC/Audio/mss/SoundSystem/getAndUpdateSampleStatus.cpp @@ -1,4 +1,4 @@ -#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp" +#include "../SoundSystem.func.hpp" namespace OpenSHC { namespace Audio { diff --git a/src/OpenSHC/Audio/mss/SoundSystem/isSampleOrStreamPlaying.cpp b/src/OpenSHC/Audio/mss/SoundSystem/isSampleOrStreamPlaying.cpp index 5e856ef..d0003f9 100644 --- a/src/OpenSHC/Audio/mss/SoundSystem/isSampleOrStreamPlaying.cpp +++ b/src/OpenSHC/Audio/mss/SoundSystem/isSampleOrStreamPlaying.cpp @@ -1,4 +1,4 @@ -#include "OpenSHC/Audio/MSS/SoundSystem.hpp" +#include "../SoundSystem.func.hpp" namespace OpenSHC { namespace Audio { diff --git a/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp b/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp index 0284109..bf0f26c 100644 --- a/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp +++ b/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp @@ -1,6 +1,4 @@ -#include "OpenSHC/Audio/MSS/SoundSystem.hpp" - -#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp" +#include "../SoundSystem.func.hpp" #include "OpenSHC/Audio/MSS/enums/SHC_SoundStream.hpp" diff --git a/src/OpenSHC/Audio/mss/SoundSystem/setStreamAndSampleVolumeUnk.cpp b/src/OpenSHC/Audio/mss/SoundSystem/setStreamAndSampleVolumeUnk.cpp index 44485ed..0df40c0 100644 --- a/src/OpenSHC/Audio/mss/SoundSystem/setStreamAndSampleVolumeUnk.cpp +++ b/src/OpenSHC/Audio/mss/SoundSystem/setStreamAndSampleVolumeUnk.cpp @@ -1,4 +1,4 @@ -#include "OpenSHC/Audio/mss/SoundSystem.func.hpp" +#include "../SoundSystem.func.hpp" namespace OpenSHC { namespace Audio { diff --git a/src/OpenSHC/Audio/mss/SoundSystem/setVolumeUnk.cpp b/src/OpenSHC/Audio/mss/SoundSystem/setVolumeUnk.cpp index 505f5e8..bcc8903 100644 --- a/src/OpenSHC/Audio/mss/SoundSystem/setVolumeUnk.cpp +++ b/src/OpenSHC/Audio/mss/SoundSystem/setVolumeUnk.cpp @@ -1,4 +1,4 @@ -#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp" +#include "../SoundSystem.func.hpp" namespace OpenSHC { namespace Audio { diff --git a/src/OpenSHC/Audio/mss/SoundSystem/setupSampleForNextSound.cpp b/src/OpenSHC/Audio/mss/SoundSystem/setupSampleForNextSound.cpp index 948bee1..acd9b18 100644 --- a/src/OpenSHC/Audio/mss/SoundSystem/setupSampleForNextSound.cpp +++ b/src/OpenSHC/Audio/mss/SoundSystem/setupSampleForNextSound.cpp @@ -1,4 +1,4 @@ -#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp" +#include "../SoundSystem.func.hpp" namespace OpenSHC { namespace Audio { diff --git a/src/OpenSHC/Random/RNG/Constructor_RNG.cpp b/src/OpenSHC/Random/RNG/Constructor_RNG.cpp index 9360960..f670df2 100644 --- a/src/OpenSHC/Random/RNG/Constructor_RNG.cpp +++ b/src/OpenSHC/Random/RNG/Constructor_RNG.cpp @@ -1,5 +1,4 @@ -#include "OpenSHC/Random/RNG.func.hpp" -#include "OpenSHC/Random/RNG.hpp" +#include "../RNG.func.hpp" namespace OpenSHC { namespace Random { diff --git a/src/OpenSHC/Random/RNG/nextRandomNumber1.cpp b/src/OpenSHC/Random/RNG/nextRandomNumber1.cpp index 988ef46..1c09603 100644 --- a/src/OpenSHC/Random/RNG/nextRandomNumber1.cpp +++ b/src/OpenSHC/Random/RNG/nextRandomNumber1.cpp @@ -1,5 +1,5 @@ -#include "OpenSHC/Random/RNG.hpp" +#include "../RNG.func.hpp" namespace OpenSHC { namespace Random { diff --git a/src/OpenSHC/Random/RNG/nextRandomNumber2.cpp b/src/OpenSHC/Random/RNG/nextRandomNumber2.cpp index cb2de6a..40642bf 100644 --- a/src/OpenSHC/Random/RNG/nextRandomNumber2.cpp +++ b/src/OpenSHC/Random/RNG/nextRandomNumber2.cpp @@ -1,5 +1,5 @@ -#include "OpenSHC/Random/RNG.hpp" +#include "../RNG.func.hpp" namespace OpenSHC { namespace Random { diff --git a/src/OpenSHC/Random/RNG/populateRNG1040.cpp b/src/OpenSHC/Random/RNG/populateRNG1040.cpp index 170f957..0489d6d 100644 --- a/src/OpenSHC/Random/RNG/populateRNG1040.cpp +++ b/src/OpenSHC/Random/RNG/populateRNG1040.cpp @@ -1,7 +1,7 @@ +#include "../RNG.func.hpp" + #include "OpenSHC/Global.func.hpp" #include "OpenSHC/OS.func.hpp" -#include "OpenSHC/Random/RNG.func.hpp" -#include "OpenSHC/Random/RNG.hpp" namespace OpenSHC { namespace Random { diff --git a/src/OpenSHC/Random/RNG/setTimeBasedSeed.cpp b/src/OpenSHC/Random/RNG/setTimeBasedSeed.cpp index 4d4643a..5d469e1 100644 --- a/src/OpenSHC/Random/RNG/setTimeBasedSeed.cpp +++ b/src/OpenSHC/Random/RNG/setTimeBasedSeed.cpp @@ -1,6 +1,7 @@ +#include "../RNG.func.hpp" + #include "OpenSHC/OS.func.hpp" -#include "OpenSHC/Random/RNG.func.hpp" -#include "OpenSHC/Random/RNG.hpp" + #include namespace OpenSHC { diff --git a/src/core/Resolver.cpp b/src/core/Resolver.cpp index 410ee13..f203548 100644 --- a/src/core/Resolver.cpp +++ b/src/core/Resolver.cpp @@ -1,6 +1,5 @@ #include "ucp3.h" - #include // TODO?: When in doubt regarding the transition to full exe: Add other logging system. diff --git a/src/precomp/FunctionResolver.h b/src/precomp/FunctionResolver.h index b90f358..2e2fbc4 100644 --- a/src/precomp/FunctionResolver.h +++ b/src/precomp/FunctionResolver.h @@ -8,9 +8,7 @@ // TODO: Maybe change naming convention to not run into these issues #include "TypeUtility.h" - #include "ucp3.h" - #include #include #include