diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | lib/hkStubs/Havok/Physics2012/Collide/Shape/HeightField/hkpHeightFieldShape.h | 2 | ||||
| m--------- | lib/sead | 0 | ||||
| -rw-r--r-- | src/Game/DLC/aocHardModeManager.h | 4 | ||||
| -rw-r--r-- | src/Game/Damage/dmgInfoManager.h | 2 | ||||
| -rw-r--r-- | src/Game/Damage/dmgStruct20.h | 2 | ||||
| -rw-r--r-- | src/KingSystem/Sound/sndMgr.h | 4 | ||||
| -rw-r--r-- | src/KingSystem/System/SystemTimers.h | 2 | ||||
| -rw-r--r-- | src/KingSystem/Utils/Byaml/Byaml.h | 10 |
9 files changed, 15 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 260c3fd8..fd309144 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,10 +24,11 @@ add_executable(uking) target_include_directories(uking PRIVATE src) target_compile_definitions(uking PRIVATE NON_MATCHING) target_compile_options(uking PRIVATE -fno-rtti -fno-exceptions) +target_compile_options(uking PRIVATE -fno-strict-aliasing) target_compile_options(uking PRIVATE -Wall -Wextra -Wdeprecated) target_compile_options(uking PRIVATE -Wno-unused-parameter -Wno-unused-private-field) -target_compile_options(uking PRIVATE -fno-strict-aliasing) target_compile_options(uking PRIVATE -Wno-invalid-offsetof) +target_compile_options(uking PRIVATE -Wextra-semi) add_subdirectory(lib/NintendoSDK) target_link_libraries(uking PUBLIC NintendoSDK) diff --git a/lib/hkStubs/Havok/Physics2012/Collide/Shape/HeightField/hkpHeightFieldShape.h b/lib/hkStubs/Havok/Physics2012/Collide/Shape/HeightField/hkpHeightFieldShape.h index 753fef20..cd2443d9 100644 --- a/lib/hkStubs/Havok/Physics2012/Collide/Shape/HeightField/hkpHeightFieldShape.h +++ b/lib/hkStubs/Havok/Physics2012/Collide/Shape/HeightField/hkpHeightFieldShape.h @@ -8,7 +8,7 @@ class hkpHeightFieldShape : public hkpShape { public: HK_DECLARE_CLASS_ALLOCATOR(hkpHeightFieldShape) HK_DECLARE_REFLECTION() - HKCD_DECLARE_SHAPE_TYPE(hkcdShapeType::HEIGHT_FIELD); + HKCD_DECLARE_SHAPE_TYPE(hkcdShapeType::HEIGHT_FIELD) struct CollideSpheresInput { HK_DECLARE_CLASS_ALLOCATOR(CollideSpheresInput) diff --git a/lib/sead b/lib/sead -Subproject 88f9a6841aadf1740accb1f7def1bc5d6f347d2 +Subproject c51a95d08254765a9a4a9a799bb74be46fd5149 diff --git a/src/Game/DLC/aocHardModeManager.h b/src/Game/DLC/aocHardModeManager.h index 49e7e1c0..375438a2 100644 --- a/src/Game/DLC/aocHardModeManager.h +++ b/src/Game/DLC/aocHardModeManager.h @@ -22,8 +22,8 @@ public: SEAD_ENUM(HardModeChange, IsLastPlayHardMode = 0, NerfHpRestore = 1, _2 = 2, DisableNoDeathDamage = 3, PatchGanonStunLock = 4, EnableLifeRegen = 5, RandomizeGuardianChargeBeam = 6, ApplyDamageMultiplier = 7, - EnableShorterEnemyNotice = 8); - SEAD_ENUM(Flag, EnableHardMode = 0); + EnableShorterEnemyNotice = 8) + SEAD_ENUM(Flag, EnableHardMode = 0) SEAD_ENUM(MultiplierType, HpRestore = 0, _1 = 1, EnemyNoticeDuration = 2) void init(sead::Heap* heap); diff --git a/src/Game/Damage/dmgInfoManager.h b/src/Game/Damage/dmgInfoManager.h index f68b0c5e..773e190d 100644 --- a/src/Game/Damage/dmgInfoManager.h +++ b/src/Game/Damage/dmgInfoManager.h @@ -12,7 +12,7 @@ namespace uking::dmg { // FIXME: incomplete class DamageInfoMgr { - SEAD_SINGLETON_DISPOSER(DamageInfoMgr); + SEAD_SINGLETON_DISPOSER(DamageInfoMgr) DamageInfoMgr(); virtual ~DamageInfoMgr(); diff --git a/src/Game/Damage/dmgStruct20.h b/src/Game/Damage/dmgStruct20.h index 65ddeb07..84c502c2 100644 --- a/src/Game/Damage/dmgStruct20.h +++ b/src/Game/Damage/dmgStruct20.h @@ -18,7 +18,7 @@ class Struct20Base { SEAD_RTTI_BASE(Struct20Base) public: - virtual ~Struct20Base(){}; + virtual ~Struct20Base() = default; virtual void reset(); virtual void combineMaybe(Struct20Base* other); diff --git a/src/KingSystem/Sound/sndMgr.h b/src/KingSystem/Sound/sndMgr.h index 4f6c349b..36202a7f 100644 --- a/src/KingSystem/Sound/sndMgr.h +++ b/src/KingSystem/Sound/sndMgr.h @@ -14,7 +14,7 @@ enum class AudioChannelType { // FIXME: incomplete struct SoundMgr { - SEAD_SINGLETON_DISPOSER(SoundMgr); + SEAD_SINGLETON_DISPOSER(SoundMgr) virtual ~SoundMgr(); @@ -23,4 +23,4 @@ public: AudioChannelType mAudioChannelType; }; -} // namespace ksys::snd
\ No newline at end of file +} // namespace ksys::snd diff --git a/src/KingSystem/System/SystemTimers.h b/src/KingSystem/System/SystemTimers.h index 81203aff..fe064c02 100644 --- a/src/KingSystem/System/SystemTimers.h +++ b/src/KingSystem/System/SystemTimers.h @@ -7,7 +7,7 @@ namespace ksys { class SystemTimers { - SEAD_SINGLETON_DISPOSER(SystemTimers); + SEAD_SINGLETON_DISPOSER(SystemTimers) SystemTimers() = default; virtual ~SystemTimers(); diff --git a/src/KingSystem/Utils/Byaml/Byaml.h b/src/KingSystem/Utils/Byaml/Byaml.h index c13500d7..fe715c3d 100644 --- a/src/KingSystem/Utils/Byaml/Byaml.h +++ b/src/KingSystem/Utils/Byaml/Byaml.h @@ -169,10 +169,10 @@ private: struct ByamlHeader { u16 getTag() const; bool isInvertHeader() const; - u16 getVersion() const { return version; }; - u32 getHashKeyTableOffset() const { return hash_key_table_offset; }; - u32 getStringTableOffset() const { return string_table_offset; }; - u32 getDataOffset() const { return data_offset; }; + u16 getVersion() const { return version; } + u32 getHashKeyTableOffset() const { return hash_key_table_offset; } + u32 getStringTableOffset() const { return string_table_offset; } + u32 getDataOffset() const { return data_offset; } u16 magic; u16 version; @@ -188,7 +188,7 @@ struct ByamlContainerHeader { return ByamlType(*reinterpret_cast<const u8*>(&type_and_size)); } - u32 getCount() const { return type_and_size >> 8; }; + u32 getCount() const { return type_and_size >> 8; } u32 type_and_size; }; |