Skip to content

Commit

Permalink
Add missing newlines, normalize CRLF endings
Browse files Browse the repository at this point in the history
  • Loading branch information
ThePixelGamer committed Aug 28, 2024
1 parent 8c075e0 commit e1ea489
Show file tree
Hide file tree
Showing 26 changed files with 97 additions and 93 deletions.
10 changes: 5 additions & 5 deletions lib/hkStubs/Havok/Geometry/Internal/Types/hkcdVertex.h
Original file line number Diff line number Diff line change
@@ -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 {};
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ inline hkVector4& hkpConvexTranslateShape::getTranslation() {

HK_FORCE_INLINE int hkpConvexTranslateShape::getNumCollisionSpheres() const {
return getChildShape()->getNumCollisionSpheres();
}
}
16 changes: 8 additions & 8 deletions src/Game/AI/AI/AirOcta/AirOctaDataMgr.cpp
Original file line number Diff line number Diff line change
@@ -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
#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
84 changes: 42 additions & 42 deletions src/Game/AI/AI/AirOcta/AirOctaDataMgr.h
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
#pragma once

#include <container/seadObjArray.h>
#include <prim/seadRuntimeTypeInfo.h>
#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<MessageData, 4> 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
#pragma once

#include <container/seadObjArray.h>
#include <prim/seadRuntimeTypeInfo.h>
#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<MessageData, 4> 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
2 changes: 1 addition & 1 deletion src/Game/UI/uiFadeProgress.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ void FadeProgress::setIsActive() {
mActive = true;
}

} // namespace uking::ui
} // namespace uking::ui
2 changes: 1 addition & 1 deletion src/Game/UI/uiFadeProgress.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ class FadeProgress {
float mSteps = 1.0;
};

} // namespace uking::ui
} // namespace uking::ui
26 changes: 13 additions & 13 deletions src/KingSystem/ActorSystem/AS/ASList.h
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/KingSystem/Event/evtEvent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
namespace ksys::evt {

Event::Event() {}
} // namespace ksys::evt
} // namespace ksys::evt
2 changes: 1 addition & 1 deletion src/KingSystem/Framework/Framework.cpp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#include "KingSystem/Framework/Framework.h"
#include "KingSystem/Framework/Framework.h"
2 changes: 1 addition & 1 deletion src/KingSystem/Framework/Framework.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ struct Framework {
nn::oe::OperationMode mOperationMode;
};

} // namespace ksys::frm
} // namespace ksys::frm
4 changes: 3 additions & 1 deletion src/KingSystem/GameData/gdtManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,9 @@ GDT_SET_IMPL_(setVec4f, detail::SetterTraits<sead::Vector4f>)
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; \
Expand Down
4 changes: 3 additions & 1 deletion src/KingSystem/GameData/gdtSpecialFlags.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/KingSystem/Map/mapPlacementAreaMgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -637,4 +637,4 @@ void PlacementAreaMgr::unloadDemoCulling() {
}
}

} // namespace ksys::map
} // namespace ksys::map
2 changes: 1 addition & 1 deletion src/KingSystem/Map/mapPlacementAreaMgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -241,4 +241,4 @@ class PlacementAreaMgr {
};
KSYS_CHECK_SIZE_NX150(PlacementAreaMgr, 0x2D5D0);

} // namespace ksys::map
} // namespace ksys::map
Original file line number Diff line number Diff line change
Expand Up @@ -158,4 +158,4 @@ void SphereShape::getTranslate(sead::Vector3f* out, const hkTransformf& transfor
storeToVec3(out, translate);
}

} // namespace ksys::phys
} // namespace ksys::phys
2 changes: 1 addition & 1 deletion src/KingSystem/Sound/sndMgr.cpp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#include "KingSystem/Sound/sndMgr.h"
#include "KingSystem/Sound/sndMgr.h"
2 changes: 1 addition & 1 deletion src/KingSystem/Sound/sndResource.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
} // namespace ksys::snd
2 changes: 1 addition & 1 deletion src/KingSystem/System/NXArgs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
} // namespace ksys
2 changes: 1 addition & 1 deletion src/KingSystem/System/NXArgs.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@ class nxargs {
};
KSYS_CHECK_SIZE_NX150(nxargs, 0x48);

} // namespace ksys
} // namespace ksys
2 changes: 1 addition & 1 deletion src/KingSystem/System/ProductReporter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -243,4 +243,4 @@ PRODUCT_REPORTER_S32_GETTER(getPlayTimeConsole, PlayReportKey::PlayReport_PlayTi

#undef PRODUCT_REPORTER_S32_GETTER

} // namespace ksys
} // namespace ksys
2 changes: 1 addition & 1 deletion src/KingSystem/System/VideoRecorder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ void VideoRecorder::postCalc() {
mFrameNumber++;
}

} // namespace ksys
} // namespace ksys
2 changes: 1 addition & 1 deletion src/KingSystem/Utils/Byaml/ByamlArrayIter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ bool ByamlArrayIter::getDataByIndex(ByamlData* data, s32 index) {

return true;
}
} // namespace al
} // namespace al
2 changes: 1 addition & 1 deletion src/KingSystem/Utils/Byaml/ByamlData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
namespace al {
ByamlData::ByamlData() = default;

} // namespace al
} // namespace al
2 changes: 1 addition & 1 deletion src/KingSystem/Utils/Byaml/ByamlLocal.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#include "KingSystem/Utils/Byaml/ByamlLocal.h"

namespace al::ByamlLocalUtil {} // namespace al::ByamlLocalUtil
namespace al::ByamlLocalUtil {} // namespace al::ByamlLocalUtil
2 changes: 1 addition & 1 deletion src/KingSystem/Utils/Byaml/ByamlStringTableIter.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ class ByamlStringTableIter {
static constexpr u32 TableOffset = 4u;
};

} // namespace al
} // namespace al
8 changes: 4 additions & 4 deletions src/KingSystem/World/worldManager.h
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#pragma once

#include <utility/aglAtomicPtrArray.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterIO.h>
#include <utility/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <container/seadPtrArray.h>
#include <container/seadSafeArray.h>
#include <hostio/seadHostIONode.h>
#include <mc/seadJobQueue.h>
#include <prim/seadSizedEnum.h>
#include <utility/aglAtomicPtrArray.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterIO.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resHandle.h"
#include "KingSystem/System/StageInfo.h"
#include "KingSystem/Utils/Types.h"
Expand Down

0 comments on commit e1ea489

Please sign in to comment.