From e1ea48975e19c3b5ade3d0e4e871c418c748f8ac Mon Sep 17 00:00:00 2001 From: ThePixelGamer Date: Tue, 27 Aug 2024 21:59:10 -0500 Subject: [PATCH] Add missing newlines, normalize CRLF endings --- .../Geometry/Internal/Types/hkcdVertex.h | 10 +-- .../ConvexTranslate/hkpConvexTranslateShape.h | 2 +- src/Game/AI/AI/AirOcta/AirOctaDataMgr.cpp | 16 ++-- src/Game/AI/AI/AirOcta/AirOctaDataMgr.h | 84 +++++++++---------- src/Game/UI/uiFadeProgress.cpp | 2 +- src/Game/UI/uiFadeProgress.h | 2 +- src/KingSystem/ActorSystem/AS/ASList.h | 26 +++--- src/KingSystem/Event/evtEvent.cpp | 2 +- src/KingSystem/Framework/Framework.cpp | 2 +- src/KingSystem/Framework/Framework.h | 2 +- src/KingSystem/GameData/gdtManager.cpp | 4 +- src/KingSystem/GameData/gdtSpecialFlags.cpp | 4 +- src/KingSystem/Map/mapPlacementAreaMgr.cpp | 2 +- src/KingSystem/Map/mapPlacementAreaMgr.h | 2 +- .../Shape/Sphere/physSphereShape.cpp | 2 +- src/KingSystem/Sound/sndMgr.cpp | 2 +- src/KingSystem/Sound/sndResource.cpp | 2 +- src/KingSystem/System/NXArgs.cpp | 2 +- src/KingSystem/System/NXArgs.h | 2 +- src/KingSystem/System/ProductReporter.cpp | 2 +- src/KingSystem/System/VideoRecorder.cpp | 2 +- src/KingSystem/Utils/Byaml/ByamlArrayIter.cpp | 2 +- src/KingSystem/Utils/Byaml/ByamlData.cpp | 2 +- src/KingSystem/Utils/Byaml/ByamlLocal.cpp | 2 +- .../Utils/Byaml/ByamlStringTableIter.h | 2 +- src/KingSystem/World/worldManager.h | 8 +- 26 files changed, 97 insertions(+), 93 deletions(-) diff --git a/lib/hkStubs/Havok/Geometry/Internal/Types/hkcdVertex.h b/lib/hkStubs/Havok/Geometry/Internal/Types/hkcdVertex.h index ddae5b0d8..91d5a0218 100644 --- a/lib/hkStubs/Havok/Geometry/Internal/Types/hkcdVertex.h +++ b/lib/hkStubs/Havok/Geometry/Internal/Types/hkcdVertex.h @@ -1,5 +1,5 @@ -#pragma once - -#include "Havok/Common/Base/Math/hkMath.h" - -class hkcdVertex : public hkVector4f {}; +#pragma once + +#include "Havok/Common/Base/Math/hkMath.h" + +class hkcdVertex : public hkVector4f {}; diff --git a/lib/hkStubs/Havok/Physics2012/Collide/Shape/Convex/ConvexTranslate/hkpConvexTranslateShape.h b/lib/hkStubs/Havok/Physics2012/Collide/Shape/Convex/ConvexTranslate/hkpConvexTranslateShape.h index 07f70c631..246953b9f 100644 --- a/lib/hkStubs/Havok/Physics2012/Collide/Shape/Convex/ConvexTranslate/hkpConvexTranslateShape.h +++ b/lib/hkStubs/Havok/Physics2012/Collide/Shape/Convex/ConvexTranslate/hkpConvexTranslateShape.h @@ -66,4 +66,4 @@ inline hkVector4& hkpConvexTranslateShape::getTranslation() { HK_FORCE_INLINE int hkpConvexTranslateShape::getNumCollisionSpheres() const { return getChildShape()->getNumCollisionSpheres(); -} \ No newline at end of file +} diff --git a/src/Game/AI/AI/AirOcta/AirOctaDataMgr.cpp b/src/Game/AI/AI/AirOcta/AirOctaDataMgr.cpp index bd6ab882d..0b5b02415 100644 --- a/src/Game/AI/AI/AirOcta/AirOctaDataMgr.cpp +++ b/src/Game/AI/AI/AirOcta/AirOctaDataMgr.cpp @@ -1,8 +1,8 @@ -#include "Game/AI/AI/AirOcta/AirOctaDataMgr.h" -namespace uking { - -void AirOctaDataMgr::changeOctasYheightMaybe() { - float result = vec_EC.y + unk_110 + unk_114 + unk_118 + unk_11c; - vec_F8.y = result; -} -} // namespace uking \ No newline at end of file +#include "Game/AI/AI/AirOcta/AirOctaDataMgr.h" +namespace uking { + +void AirOctaDataMgr::changeOctasYheightMaybe() { + float result = vec_EC.y + unk_110 + unk_114 + unk_118 + unk_11c; + vec_F8.y = result; +} +} // namespace uking diff --git a/src/Game/AI/AI/AirOcta/AirOctaDataMgr.h b/src/Game/AI/AI/AirOcta/AirOctaDataMgr.h index 9a681470a..ae7e65a33 100644 --- a/src/Game/AI/AI/AirOcta/AirOctaDataMgr.h +++ b/src/Game/AI/AI/AirOcta/AirOctaDataMgr.h @@ -1,42 +1,42 @@ -#pragma once - -#include -#include -#include "KingSystem/ActorSystem/actActor.h" -#include "KingSystem/ActorSystem/actAiClassDef.h" - -namespace uking { -class AirOctaDataMgr { - SEAD_RTTI_BASE(AirOctaDataMgr) -public: - ksys::act::BaseProcLink& getProc() { return mBaseProcLink; } - void changeOctasYheightMaybe(); - - struct MessageData { - u32 unk_00; - u64 unk_08; - }; - - /* 0x08 */ ksys::act::BaseProcLink mBaseProcLink; - /* 0x18 */ ksys::act::BaseProcLink mBaseProcLink2; - /* 0x28 */ void* unk_28{}; - /* 0x30 */ u32 unk_30{}; - /* 0x34 */ sead::Vector3f unk_34{sead::Vector3f::zero}; - /* 0x40 */ void* unk_40{}; - /* 0x48 */ u32 unk_48{}; - /* 0x4C */ sead::Vector3f unk_4C{sead::Vector3f::zero}; - /* 0x58 */ sead::FixedObjArray obj_arr; - /* 0xD8 */ u16 unk_D8{}; - /* 0xDA */ bool unk_DA{}; - /* 0xDC */ u32 unk_DC; - /* 0xE0 */ sead::Vector3f vec_E0{sead::Vector3f::zero}; - /* 0xEC */ sead::Vector3f vec_EC{sead::Vector3f::zero}; - /* 0xF8 */ sead::Vector3f vec_F8{sead::Vector3f::zero}; - /*0x104 */ sead::Vector3f vec_104{sead::Vector3f::zero}; - /*0x110 */ float unk_110; - /*0x114 */ float unk_114; - /*0x118 */ float unk_118; - /*0x11c */ float unk_11c; - /*0x120 */ u32 mFlags; -}; -} // namespace uking \ No newline at end of file +#pragma once + +#include +#include +#include "KingSystem/ActorSystem/actActor.h" +#include "KingSystem/ActorSystem/actAiClassDef.h" + +namespace uking { +class AirOctaDataMgr { + SEAD_RTTI_BASE(AirOctaDataMgr) +public: + ksys::act::BaseProcLink& getProc() { return mBaseProcLink; } + void changeOctasYheightMaybe(); + + struct MessageData { + u32 unk_00; + u64 unk_08; + }; + + /* 0x08 */ ksys::act::BaseProcLink mBaseProcLink; + /* 0x18 */ ksys::act::BaseProcLink mBaseProcLink2; + /* 0x28 */ void* unk_28{}; + /* 0x30 */ u32 unk_30{}; + /* 0x34 */ sead::Vector3f unk_34{sead::Vector3f::zero}; + /* 0x40 */ void* unk_40{}; + /* 0x48 */ u32 unk_48{}; + /* 0x4C */ sead::Vector3f unk_4C{sead::Vector3f::zero}; + /* 0x58 */ sead::FixedObjArray obj_arr; + /* 0xD8 */ u16 unk_D8{}; + /* 0xDA */ bool unk_DA{}; + /* 0xDC */ u32 unk_DC; + /* 0xE0 */ sead::Vector3f vec_E0{sead::Vector3f::zero}; + /* 0xEC */ sead::Vector3f vec_EC{sead::Vector3f::zero}; + /* 0xF8 */ sead::Vector3f vec_F8{sead::Vector3f::zero}; + /*0x104 */ sead::Vector3f vec_104{sead::Vector3f::zero}; + /*0x110 */ float unk_110; + /*0x114 */ float unk_114; + /*0x118 */ float unk_118; + /*0x11c */ float unk_11c; + /*0x120 */ u32 mFlags; +}; +} // namespace uking diff --git a/src/Game/UI/uiFadeProgress.cpp b/src/Game/UI/uiFadeProgress.cpp index 87ded1662..be6120971 100644 --- a/src/Game/UI/uiFadeProgress.cpp +++ b/src/Game/UI/uiFadeProgress.cpp @@ -53,4 +53,4 @@ void FadeProgress::setIsActive() { mActive = true; } -} // namespace uking::ui \ No newline at end of file +} // namespace uking::ui diff --git a/src/Game/UI/uiFadeProgress.h b/src/Game/UI/uiFadeProgress.h index 4669ff865..b4f525c45 100644 --- a/src/Game/UI/uiFadeProgress.h +++ b/src/Game/UI/uiFadeProgress.h @@ -25,4 +25,4 @@ class FadeProgress { float mSteps = 1.0; }; -} // namespace uking::ui \ No newline at end of file +} // namespace uking::ui diff --git a/src/KingSystem/ActorSystem/AS/ASList.h b/src/KingSystem/ActorSystem/AS/ASList.h index b413d2de1..d21a29c97 100644 --- a/src/KingSystem/ActorSystem/AS/ASList.h +++ b/src/KingSystem/ActorSystem/AS/ASList.h @@ -1,13 +1,13 @@ -#pragma once -#include "KingSystem/ActorSystem/actActor.h" -namespace ksys::as { -class ASList { -public: - void startAnimationMaybe(f32 a2, f32 a3, const sead::SafeString& animation, int a5, int a6, - bool a7); - bool goLimpFromHeadShotMaybe(u32 a1, const sead::SafeString& a2, u32 a3); // x_8 - s64 x_2(u32 a1, int a2, bool m, u32 a4); - u8 sub_710115D3B8(); -}; - -} // namespace ksys::as +#pragma once +#include "KingSystem/ActorSystem/actActor.h" +namespace ksys::as { +class ASList { +public: + void startAnimationMaybe(f32 a2, f32 a3, const sead::SafeString& animation, int a5, int a6, + bool a7); + bool goLimpFromHeadShotMaybe(u32 a1, const sead::SafeString& a2, u32 a3); // x_8 + s64 x_2(u32 a1, int a2, bool m, u32 a4); + u8 sub_710115D3B8(); +}; + +} // namespace ksys::as diff --git a/src/KingSystem/Event/evtEvent.cpp b/src/KingSystem/Event/evtEvent.cpp index 8addcda3c..68bb3aa7f 100644 --- a/src/KingSystem/Event/evtEvent.cpp +++ b/src/KingSystem/Event/evtEvent.cpp @@ -5,4 +5,4 @@ namespace ksys::evt { Event::Event() {} -} // namespace ksys::evt \ No newline at end of file +} // namespace ksys::evt diff --git a/src/KingSystem/Framework/Framework.cpp b/src/KingSystem/Framework/Framework.cpp index f11ef44e4..baee8175a 100644 --- a/src/KingSystem/Framework/Framework.cpp +++ b/src/KingSystem/Framework/Framework.cpp @@ -1 +1 @@ -#include "KingSystem/Framework/Framework.h" \ No newline at end of file +#include "KingSystem/Framework/Framework.h" diff --git a/src/KingSystem/Framework/Framework.h b/src/KingSystem/Framework/Framework.h index aa390f572..1c78b6d44 100644 --- a/src/KingSystem/Framework/Framework.h +++ b/src/KingSystem/Framework/Framework.h @@ -12,4 +12,4 @@ struct Framework { nn::oe::OperationMode mOperationMode; }; -} // namespace ksys::frm \ No newline at end of file +} // namespace ksys::frm diff --git a/src/KingSystem/GameData/gdtManager.cpp b/src/KingSystem/GameData/gdtManager.cpp index 197bdcbeb..2e68921f1 100644 --- a/src/KingSystem/GameData/gdtManager.cpp +++ b/src/KingSystem/GameData/gdtManager.cpp @@ -527,7 +527,9 @@ GDT_SET_IMPL_(setVec4f, detail::SetterTraits) return false; \ return getParam().get1().NAME(name); \ } \ - bool Manager::NAME##_(const sead::SafeString& name) { return NAME(name); } \ + bool Manager::NAME##_(const sead::SafeString& name) { \ + return NAME(name); \ + } \ bool Manager::NAME(const sead::SafeString& name, int sub_idx) { \ if (mBitFlags.isOn(BitFlag::_40000)) \ return false; \ diff --git a/src/KingSystem/GameData/gdtSpecialFlags.cpp b/src/KingSystem/GameData/gdtSpecialFlags.cpp index 0ecc96bf5..e08a4dd25 100644 --- a/src/KingSystem/GameData/gdtSpecialFlags.cpp +++ b/src/KingSystem/GameData/gdtSpecialFlags.cpp @@ -12,7 +12,9 @@ const char* sDungeonClearFlagPrefix = "Clear_"; const char* sDungeonEnterFlagPrefix = "Enter_"; #define GDT_DEFINE_BOOL_GETTER(FLAG) \ - bool getBool_##FLAG(bool debug = false) { return getBool(flag_##FLAG(), debug); } + bool getBool_##FLAG(bool debug = false) { \ + return getBool(flag_##FLAG(), debug); \ + } GDT_DEFINE_BOOL_GETTER(SaveProhibition) GDT_DEFINE_BOOL_GETTER(SaveProhibitionArea) diff --git a/src/KingSystem/Map/mapPlacementAreaMgr.cpp b/src/KingSystem/Map/mapPlacementAreaMgr.cpp index 295e5bfd4..9744f8d2d 100644 --- a/src/KingSystem/Map/mapPlacementAreaMgr.cpp +++ b/src/KingSystem/Map/mapPlacementAreaMgr.cpp @@ -637,4 +637,4 @@ void PlacementAreaMgr::unloadDemoCulling() { } } -} // namespace ksys::map \ No newline at end of file +} // namespace ksys::map diff --git a/src/KingSystem/Map/mapPlacementAreaMgr.h b/src/KingSystem/Map/mapPlacementAreaMgr.h index 17ddd0ad3..73cb6cda6 100644 --- a/src/KingSystem/Map/mapPlacementAreaMgr.h +++ b/src/KingSystem/Map/mapPlacementAreaMgr.h @@ -241,4 +241,4 @@ class PlacementAreaMgr { }; KSYS_CHECK_SIZE_NX150(PlacementAreaMgr, 0x2D5D0); -} // namespace ksys::map \ No newline at end of file +} // namespace ksys::map diff --git a/src/KingSystem/Physics/RigidBody/Shape/Sphere/physSphereShape.cpp b/src/KingSystem/Physics/RigidBody/Shape/Sphere/physSphereShape.cpp index 46f211de0..da4fb1207 100644 --- a/src/KingSystem/Physics/RigidBody/Shape/Sphere/physSphereShape.cpp +++ b/src/KingSystem/Physics/RigidBody/Shape/Sphere/physSphereShape.cpp @@ -158,4 +158,4 @@ void SphereShape::getTranslate(sead::Vector3f* out, const hkTransformf& transfor storeToVec3(out, translate); } -} // namespace ksys::phys \ No newline at end of file +} // namespace ksys::phys diff --git a/src/KingSystem/Sound/sndMgr.cpp b/src/KingSystem/Sound/sndMgr.cpp index 18af6b655..298c86c13 100644 --- a/src/KingSystem/Sound/sndMgr.cpp +++ b/src/KingSystem/Sound/sndMgr.cpp @@ -1 +1 @@ -#include "KingSystem/Sound/sndMgr.h" \ No newline at end of file +#include "KingSystem/Sound/sndMgr.h" diff --git a/src/KingSystem/Sound/sndResource.cpp b/src/KingSystem/Sound/sndResource.cpp index df3f6b7df..5dedf59d9 100644 --- a/src/KingSystem/Sound/sndResource.cpp +++ b/src/KingSystem/Sound/sndResource.cpp @@ -23,4 +23,4 @@ void SoundResource::init(sead::Heap* heap, sead::Heap* debug_heap, bool extra_la sead::ExpHeap::cHeapDirection_Forward, false); } -} // namespace ksys::snd \ No newline at end of file +} // namespace ksys::snd diff --git a/src/KingSystem/System/NXArgs.cpp b/src/KingSystem/System/NXArgs.cpp index 9738dabf2..3b4d20381 100644 --- a/src/KingSystem/System/NXArgs.cpp +++ b/src/KingSystem/System/NXArgs.cpp @@ -78,4 +78,4 @@ void nxargs::allocEntries(sead::Heap* heap, const u8* data) { // todo: placeholder to hide the warning in tools/check void nxargs::handleArgs() {} -} // namespace ksys \ No newline at end of file +} // namespace ksys diff --git a/src/KingSystem/System/NXArgs.h b/src/KingSystem/System/NXArgs.h index 6ba6696e3..80fbfe062 100644 --- a/src/KingSystem/System/NXArgs.h +++ b/src/KingSystem/System/NXArgs.h @@ -96,4 +96,4 @@ class nxargs { }; KSYS_CHECK_SIZE_NX150(nxargs, 0x48); -} // namespace ksys \ No newline at end of file +} // namespace ksys diff --git a/src/KingSystem/System/ProductReporter.cpp b/src/KingSystem/System/ProductReporter.cpp index 24ddb8c85..62c0536c2 100644 --- a/src/KingSystem/System/ProductReporter.cpp +++ b/src/KingSystem/System/ProductReporter.cpp @@ -243,4 +243,4 @@ PRODUCT_REPORTER_S32_GETTER(getPlayTimeConsole, PlayReportKey::PlayReport_PlayTi #undef PRODUCT_REPORTER_S32_GETTER -} // namespace ksys \ No newline at end of file +} // namespace ksys diff --git a/src/KingSystem/System/VideoRecorder.cpp b/src/KingSystem/System/VideoRecorder.cpp index 53430f929..2023a9c7c 100644 --- a/src/KingSystem/System/VideoRecorder.cpp +++ b/src/KingSystem/System/VideoRecorder.cpp @@ -15,4 +15,4 @@ void VideoRecorder::postCalc() { mFrameNumber++; } -} // namespace ksys \ No newline at end of file +} // namespace ksys diff --git a/src/KingSystem/Utils/Byaml/ByamlArrayIter.cpp b/src/KingSystem/Utils/Byaml/ByamlArrayIter.cpp index fe5db2056..52167f8e8 100644 --- a/src/KingSystem/Utils/Byaml/ByamlArrayIter.cpp +++ b/src/KingSystem/Utils/Byaml/ByamlArrayIter.cpp @@ -26,4 +26,4 @@ bool ByamlArrayIter::getDataByIndex(ByamlData* data, s32 index) { return true; } -} // namespace al \ No newline at end of file +} // namespace al diff --git a/src/KingSystem/Utils/Byaml/ByamlData.cpp b/src/KingSystem/Utils/Byaml/ByamlData.cpp index 2aff5f969..cb8712b36 100644 --- a/src/KingSystem/Utils/Byaml/ByamlData.cpp +++ b/src/KingSystem/Utils/Byaml/ByamlData.cpp @@ -4,4 +4,4 @@ namespace al { ByamlData::ByamlData() = default; -} // namespace al \ No newline at end of file +} // namespace al diff --git a/src/KingSystem/Utils/Byaml/ByamlLocal.cpp b/src/KingSystem/Utils/Byaml/ByamlLocal.cpp index 321fc8799..30b150435 100644 --- a/src/KingSystem/Utils/Byaml/ByamlLocal.cpp +++ b/src/KingSystem/Utils/Byaml/ByamlLocal.cpp @@ -1,3 +1,3 @@ #include "KingSystem/Utils/Byaml/ByamlLocal.h" -namespace al::ByamlLocalUtil {} // namespace al::ByamlLocalUtil \ No newline at end of file +namespace al::ByamlLocalUtil {} // namespace al::ByamlLocalUtil diff --git a/src/KingSystem/Utils/Byaml/ByamlStringTableIter.h b/src/KingSystem/Utils/Byaml/ByamlStringTableIter.h index 5e397ab42..4532e96f6 100644 --- a/src/KingSystem/Utils/Byaml/ByamlStringTableIter.h +++ b/src/KingSystem/Utils/Byaml/ByamlStringTableIter.h @@ -24,4 +24,4 @@ class ByamlStringTableIter { static constexpr u32 TableOffset = 4u; }; -} // namespace al \ No newline at end of file +} // namespace al diff --git a/src/KingSystem/World/worldManager.h b/src/KingSystem/World/worldManager.h index 90cdc150c..159ebd8d0 100644 --- a/src/KingSystem/World/worldManager.h +++ b/src/KingSystem/World/worldManager.h @@ -1,15 +1,15 @@ #pragma once -#include -#include -#include -#include #include #include #include #include #include #include +#include +#include +#include +#include #include "KingSystem/Resource/resHandle.h" #include "KingSystem/System/StageInfo.h" #include "KingSystem/Utils/Types.h"