diff --git a/src/KingSystem/GameData/gdtManager.cpp b/src/KingSystem/GameData/gdtManager.cpp index 197bdcbe..2e68921f 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/gdtSpecialFlagNames.cpp b/src/KingSystem/GameData/gdtSpecialFlagNames.cpp index 7c58bd12..7ff7cdac 100644 --- a/src/KingSystem/GameData/gdtSpecialFlagNames.cpp +++ b/src/KingSystem/GameData/gdtSpecialFlagNames.cpp @@ -3,7 +3,9 @@ namespace ksys::gdt::flagname { #define GDT_DEFINE_SPECIAL_FLAG_NAME(name) \ - const char* name() { return #name; } + const char* name() { \ + return #name; \ + } GDT_DEFINE_SPECIAL_FLAG_NAME(Aoc_HardMode_Enabled) GDT_DEFINE_SPECIAL_FLAG_NAME(BowPorchStockNum) diff --git a/src/KingSystem/Physics/Rig/physBoneAccessor.cpp b/src/KingSystem/Physics/Rig/physBoneAccessor.cpp index 57ed1337..dcd42708 100644 --- a/src/KingSystem/Physics/Rig/physBoneAccessor.cpp +++ b/src/KingSystem/Physics/Rig/physBoneAccessor.cpp @@ -99,8 +99,7 @@ const hkQsTransformf& BoneAccessor::getBoneModelSpace(const BoneAccessor::Indice #ifdef MATCHING_HACK_NX_CLANG [[gnu::noinline]] #endif -sead::SafeString -BoneAccessor::getBoneName(const sead::SafeString& name) { +sead::SafeString BoneAccessor::getBoneName(const sead::SafeString& name) { int substr_index = 0; int separator_index = name.rfindIndex(":");