diff --git a/CMakeLists.txt b/CMakeLists.txt index 31d6b0451..3868a0401 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.15) project(uking CXX) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -30,16 +30,9 @@ target_compile_options(uking PRIVATE -Wno-unused-parameter -Wno-unused-private-f target_compile_options(uking PRIVATE -Wno-invalid-offsetof) target_compile_options(uking PRIVATE -Wextra-semi) -set(NN_SDK_MAJOR 4) -set(NN_SDK_MINOR 4) -set(NN_SDK_PATCH 0) +set(NN_SDK 4.4.0) +set(NN_WARE 1.6.1) set(NN_SDK_TYPE "Release") - -# todo: figure out actual number, in between odyssey and splatoon -set(NN_WARE_MAJOR 1) -set(NN_WARE_MINOR 6) -set(NN_WARE_PATCH 1) - add_subdirectory(lib/NintendoSDK) target_link_libraries(uking PUBLIC NintendoSDK) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 06a2cde26..f0689c44e 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -39763,7 +39763,7 @@ Address,Quality,Size,Name 0x0000007100654244,U,000076,apQueryNavMeshFace 0x0000007100654290,U,000008,apQueryUnknown 0x0000007100654298,U,000916,sinitSomeBfevflStrings -0x000000710065462c,U,000100,_ZN4sead15DebugFontMgrNvn18SingletonDisposer_D1Ev +0x000000710065462c,O,000100,_ZN4sead15DebugFontMgrNvn18SingletonDisposer_D1Ev 0x0000007100654690,U,000108, 0x00000071006546fc,W,000140,_ZN4ksys3map16AutoPlacementMgr14createInstanceEPN4sead4HeapE 0x0000007100654788,O,000088,_ZN4ksys3map16AutoPlacementMgr14deleteInstanceEv @@ -54787,7 +54787,7 @@ Address,Quality,Size,Name 0x00000071009221ec,U,000012, 0x00000071009221f8,U,000012, 0x0000007100922204,U,000008, -0x000000710092220c,U,000008,_ZNK4sead15DebugFontMgrNvn12getCharWidthEDs +0x000000710092220c,O,000008,_ZNK4sead15DebugFontMgrNvn12getCharWidthEDs 0x0000007100922214,U,000008, 0x000000710092221c,U,000012, 0x0000007100922228,U,000012, @@ -63192,33 +63192,33 @@ Address,Quality,Size,Name 0x0000007100afe640,U,000024, 0x0000007100afe658,U,000100, 0x0000007100afe6bc,U,000108, -0x0000007100afe728,U,000168,_ZN4sead19DebugFontMgrJis1Nvn14createInstanceEPNS_4HeapE +0x0000007100afe728,M,000168,_ZN4sead19DebugFontMgrJis1Nvn14createInstanceEPNS_4HeapE 0x0000007100afe7d0,U,000004,nullsub_3181 0x0000007100afe7d4,U,000004,j__ZdlPv_592 -0x0000007100afe7d8,U,000300,_ZN4sead19DebugFontMgrJis1Nvn10initializeEPNS_4HeapEPKcS4_S4_j +0x0000007100afe7d8,M,000300,_ZN4sead19DebugFontMgrJis1Nvn10initializeEPNS_4HeapEPKcS4_S4_j 0x0000007100afe904,U,001252, -0x0000007100afede8,U,000044,_ZN4sead19DebugFontMgrJis1Nvn22swapUniformBlockBufferEv -0x0000007100afee14,U,000008,_ZNK4sead19DebugFontMgrJis1Nvn9getHeightEv -0x0000007100afee1c,U,000008,_ZNK4sead19DebugFontMgrJis1Nvn8getWidthEv -0x0000007100afee24,U,000024,_ZNK4sead19DebugFontMgrJis1Nvn12getCharWidthEDs +0x0000007100afede8,O,000044,_ZN4sead19DebugFontMgrJis1Nvn22swapUniformBlockBufferEv +0x0000007100afee14,O,000008,_ZNK4sead19DebugFontMgrJis1Nvn9getHeightEv +0x0000007100afee1c,O,000008,_ZNK4sead19DebugFontMgrJis1Nvn8getWidthEv +0x0000007100afee24,O,000024,_ZNK4sead19DebugFontMgrJis1Nvn12getCharWidthEDs 0x0000007100afee3c,U,000008, -0x0000007100afee44,U,000044,_ZNK4sead19DebugFontMgrJis1Nvn5beginEPNS_11DrawContextE +0x0000007100afee44,O,000044,_ZNK4sead19DebugFontMgrJis1Nvn5beginEPNS_11DrawContextE 0x0000007100afee70,U,000004,_ZN2nn4ui2d13FontContainerD2Ev 0x0000007100afee74,U,000836,_ZNK4sead19DebugFontMgrJis1Nvn5printEPNS_11DrawContextERKNS_10ProjectionERKNS_6CameraERKNS_8Matrix34IfEERKNS_7Color4fEPKvi 0x0000007100aff1b8,U,000008, 0x0000007100aff1c0,U,000100, 0x0000007100aff224,U,000108, -0x0000007100aff290,U,000164,_ZN4sead15DebugFontMgrNvn14createInstanceEPNS_4HeapE +0x0000007100aff290,O,000164,_ZN4sead15DebugFontMgrNvn14createInstanceEPNS_4HeapE 0x0000007100aff334,U,000004,nullsub_3183 0x0000007100aff338,U,000004,j__ZdlPv_593 -0x0000007100aff33c,U,000240,_ZN4sead15DebugFontMgrNvn10initializeEPNS_4HeapEPKcS4_j +0x0000007100aff33c,O,000240,_ZN4sead15DebugFontMgrNvn10initializeEPNS_4HeapEPKcS4_j 0x0000007100aff42c,U,001188,_ZN4sead15DebugFontMgrNvn20initializeFromBinaryEPNS_4HeapEPvmS3_mj -0x0000007100aff8d0,U,000044,_ZN4sead15DebugFontMgrNvn22swapUniformBlockBufferEv -0x0000007100aff8fc,U,000008,_ZNK4sead15DebugFontMgrNvn9getHeightEv +0x0000007100aff8d0,O,000044,_ZN4sead15DebugFontMgrNvn22swapUniformBlockBufferEv +0x0000007100aff8fc,O,000008,_ZNK4sead15DebugFontMgrNvn9getHeightEv 0x0000007100aff904,U,000008, 0x0000007100aff90c,U,000008, 0x0000007100aff914,U,000008, -0x0000007100aff91c,U,000044,_ZNK4sead15DebugFontMgrNvn5beginEPNS_11DrawContextE +0x0000007100aff91c,O,000044,_ZNK4sead15DebugFontMgrNvn5beginEPNS_11DrawContextE 0x0000007100aff948,U,000004,nullsub_3184 0x0000007100aff94c,U,000716,_ZNK4sead15DebugFontMgrNvn5printEPNS_11DrawContextERKNS_10ProjectionERKNS_6CameraERKNS_8Matrix34IfEERKNS_7Color4fEPKvi 0x0000007100affc18,U,000008, @@ -64200,7 +64200,7 @@ Address,Quality,Size,Name 0x0000007100b2e4b8,U,000092,sead::MethodTreeMgr::rtti2 0x0000007100b2e514,U,000028,_ZN3agl3utl16DebugTexturePageD2Ev 0x0000007100b2e530,U,000004,nullsub_6141 -0x0000007100b2e534,U,000008,_ZN4sead15DrawLockContext4lockEv +0x0000007100b2e534,O,000008,_ZN4sead15DrawLockContext4lockEv 0x0000007100b2e53c,U,000008, 0x0000007100b2e544,U,000012, 0x0000007100b2e550,U,000004,nullsub_3254 @@ -65292,7 +65292,7 @@ Address,Quality,Size,Name 0x0000007100b66350,U,018288, 0x0000007100b6aac0,U,000016, 0x0000007100b6aad0,U,001144,_ZN3agl6detail15TextureDataUtil20convFormatNNGfxToAGLEN2nn3gfx11ImageFormatE -0x0000007100b6af48,U,000012,_ZN3agl26ResBinaryShaderArchiveData12getExtensionEv +0x0000007100b6af48,O,000012,_ZN3agl26ResBinaryShaderArchiveData12getExtensionEv 0x0000007100b6af54,U,001332, 0x0000007100b6b488,U,000844, 0x0000007100b6b7d4,U,000072,_ZN3agl22ResBinaryShaderArchive7cleanUpEv @@ -65329,11 +65329,11 @@ Address,Quality,Size,Name 0x0000007100b6d070,U,000072,_ZNK3agl11IndexStream13flushCPUCacheEjj 0x0000007100b6d0b8,O,000112,_ZN3agl15ModifyEndianU32EbPvm 0x0000007100b6d128,U,000012, -0x0000007100b6d134,U,001140,_ZN3agl16ResShaderArchive5setUpEv +0x0000007100b6d134,M,001140,_ZN3agl16ResShaderArchive5setUpEv 0x0000007100b6d5a8,U,000112, -0x0000007100b6d618,U,000048,_ZNK3agl16ResShaderProgram26getResShaderVariationArrayEv -0x0000007100b6d648,U,000068,_ZNK3agl18ResShaderVariation8getValueEi -0x0000007100b6d68c,U,000068,_ZNK3agl18ResShaderVariation5getIDEv +0x0000007100b6d618,M,000048,_ZNK3agl16ResShaderProgram26getResShaderVariationArrayEv +0x0000007100b6d648,O,000068,_ZNK3agl18ResShaderVariation8getValueEi +0x0000007100b6d68c,O,000068,_ZNK3agl18ResShaderVariation5getIDEv 0x0000007100b6d6d0,U,000024,_ZN3agl6ShaderC2Ev 0x0000007100b6d6e8,U,000008, 0x0000007100b6d6f0,U,000004,j__ZdlPv_655 diff --git a/lib/NintendoSDK b/lib/NintendoSDK index 362e47b48..a7a1e2b71 160000 --- a/lib/NintendoSDK +++ b/lib/NintendoSDK @@ -1 +1 @@ -Subproject commit 362e47b48c27ab51d6e34de11185a0d89bd32a34 +Subproject commit a7a1e2b715cbafbbe50264a6157da8388a390776 diff --git a/lib/agl b/lib/agl index 9731cfc50..e00c665fb 160000 --- a/lib/agl +++ b/lib/agl @@ -1 +1 @@ -Subproject commit 9731cfc5017f798aeca80a37fba17f3af17b8076 +Subproject commit e00c665fb8f5d54c90e9f8559fcfd3eec2e888fe diff --git a/lib/gsys/include/gsys/gsysLightRigObj.h b/lib/gsys/include/gsys/gsysLightRigObj.h index ad40f9861..fbdca4a80 100644 --- a/lib/gsys/include/gsys/gsysLightRigObj.h +++ b/lib/gsys/include/gsys/gsysLightRigObj.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace gsys { diff --git a/lib/gsys/include/gsys/gsysMaskedProjLight.h b/lib/gsys/include/gsys/gsysMaskedProjLight.h index 749b63285..652eb66cd 100644 --- a/lib/gsys/include/gsys/gsysMaskedProjLight.h +++ b/lib/gsys/include/gsys/gsysMaskedProjLight.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace gsys { diff --git a/lib/gsys/include/gsys/gsysMaskedSpotLight.h b/lib/gsys/include/gsys/gsysMaskedSpotLight.h index 8a484aef6..0b5b63870 100644 --- a/lib/gsys/include/gsys/gsysMaskedSpotLight.h +++ b/lib/gsys/include/gsys/gsysMaskedSpotLight.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace gsys { diff --git a/lib/gsys/include/gsys/gsysModelSceneConfig.h b/lib/gsys/include/gsys/gsysModelSceneConfig.h index bebe79660..958c98572 100644 --- a/lib/gsys/include/gsys/gsysModelSceneConfig.h +++ b/lib/gsys/include/gsys/gsysModelSceneConfig.h @@ -1,16 +1,16 @@ #pragma once -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include #include #include #include +#include +#include +#include namespace gsys { diff --git a/lib/gsys/include/gsys/gsysOfxLensFlareRig.h b/lib/gsys/include/gsys/gsysOfxLensFlareRig.h index 728d36164..f0b4d0a9c 100644 --- a/lib/gsys/include/gsys/gsysOfxLensFlareRig.h +++ b/lib/gsys/include/gsys/gsysOfxLensFlareRig.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace gsys { diff --git a/lib/gsys/include/gsys/gsysParticleConfig.h b/lib/gsys/include/gsys/gsysParticleConfig.h index ecaf4fd60..ccfef4ec7 100644 --- a/lib/gsys/include/gsys/gsysParticleConfig.h +++ b/lib/gsys/include/gsys/gsysParticleConfig.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include #include +#include +#include +#include namespace gsys { diff --git a/lib/gsys/include/gsys/gsysPointLight.h b/lib/gsys/include/gsys/gsysPointLight.h index d049e299e..82b6d072d 100644 --- a/lib/gsys/include/gsys/gsysPointLight.h +++ b/lib/gsys/include/gsys/gsysPointLight.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace gsys { diff --git a/lib/gsys/include/gsys/gsysSpotLight.h b/lib/gsys/include/gsys/gsysSpotLight.h index e68d3d46a..0577f41b8 100644 --- a/lib/gsys/include/gsys/gsysSpotLight.h +++ b/lib/gsys/include/gsys/gsysSpotLight.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace gsys { diff --git a/lib/gsys/src/gsys/gsysModelSceneConfig.cpp b/lib/gsys/src/gsys/gsysModelSceneConfig.cpp index b3e0f88be..b737a59c0 100644 --- a/lib/gsys/src/gsys/gsysModelSceneConfig.cpp +++ b/lib/gsys/src/gsys/gsysModelSceneConfig.cpp @@ -1,13 +1,13 @@ #include "gsys/gsysModelSceneConfig.h" -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include -#include "agl/fx/aglFxOfxLensFlare.h" +#include "effect/aglFxOfxLensFlare.h" #include "gsys/gsysLightRigObj.h" #include "gsys/gsysMaskedProjLight.h" #include "gsys/gsysMaskedSpotLight.h" diff --git a/lib/sead b/lib/sead index cc672852c..7a2b22a6a 160000 --- a/lib/sead +++ b/lib/sead @@ -1 +1 @@ -Subproject commit cc672852c6218bf081325cb955dd3d87723d16cc +Subproject commit 7a2b22a6a53f341b9752dd8134a9a6172fb7dad7 diff --git a/src/Game/DLC/aocHardModeManager.cpp b/src/Game/DLC/aocHardModeManager.cpp index f149265dd..9d8faef90 100644 --- a/src/Game/DLC/aocHardModeManager.cpp +++ b/src/Game/DLC/aocHardModeManager.cpp @@ -66,15 +66,15 @@ void HardModeManager::init_() { } void HardModeManager::nerfHpRestore(f32* hp) const { - *hp = sead::Mathf::max(*hp * getMultiplier(MultiplierType::HpRestore), 1.0f); + *hp = sead::Mathf::clampMin(*hp * getMultiplier(MultiplierType::HpRestore), 1.0f); } void HardModeManager::nerfHpRestore(s32* hp) const { - *hp = sead::Mathi::max(*hp * getMultiplier(MultiplierType::HpRestore), 1); + *hp = sead::Mathi::clampMin(*hp * getMultiplier(MultiplierType::HpRestore), 1); } void HardModeManager::modifyEnemyNoticeDuration(f32* value) const { - *value = sead::Mathf::max(*value * getMultiplier(MultiplierType::EnemyNoticeDuration), 0); + *value = sead::Mathf::clampMin(*value * getMultiplier(MultiplierType::EnemyNoticeDuration), 0); } bool HardModeManager::shouldCreateLifeRecoverInfo(ksys::act::Actor* actor) { diff --git a/src/KingSystem/ActorSystem/Awareness/actAwareness.cpp b/src/KingSystem/ActorSystem/Awareness/actAwareness.cpp index 7eb1d243d..4d4e8d673 100644 --- a/src/KingSystem/ActorSystem/Awareness/actAwareness.cpp +++ b/src/KingSystem/ActorSystem/Awareness/actAwareness.cpp @@ -1,9 +1,9 @@ #include "KingSystem/ActorSystem/Awareness/actAwareness.h" -#include -#include #include #include #include +#include +#include #include "KingSystem/ActorSystem/Awareness/actAwarenessDefs.h" #include "KingSystem/ActorSystem/Awareness/actAwarenessInstance.h" #include "KingSystem/Resource/resHandle.h" diff --git a/src/KingSystem/ActorSystem/Awareness/actAwarenessDefs.cpp b/src/KingSystem/ActorSystem/Awareness/actAwarenessDefs.cpp index 5ade34ddb..a6f3b30d7 100644 --- a/src/KingSystem/ActorSystem/Awareness/actAwarenessDefs.cpp +++ b/src/KingSystem/ActorSystem/Awareness/actAwarenessDefs.cpp @@ -1,6 +1,6 @@ #include "KingSystem/ActorSystem/Awareness/actAwarenessDefs.h" -#include #include +#include namespace ksys::act { diff --git a/src/KingSystem/ActorSystem/actAiParam.cpp b/src/KingSystem/ActorSystem/actAiParam.cpp index c54affc6e..fe35fb298 100644 --- a/src/KingSystem/ActorSystem/actAiParam.cpp +++ b/src/KingSystem/ActorSystem/actAiParam.cpp @@ -1,5 +1,5 @@ #include "KingSystem/ActorSystem/actAiParam.h" -#include +#include #include "KingSystem/ActorSystem/actActor.h" #include "KingSystem/ActorSystem/actAiClassDef.h" #include "KingSystem/ActorSystem/actAiInlineParam.h" diff --git a/src/KingSystem/ActorSystem/actBaseProcJobQue.h b/src/KingSystem/ActorSystem/actBaseProcJobQue.h index 8e8fd35fe..9d098f06b 100644 --- a/src/KingSystem/ActorSystem/actBaseProcJobQue.h +++ b/src/KingSystem/ActorSystem/actBaseProcJobQue.h @@ -1,12 +1,12 @@ #pragma once -#include #include #include #include #include #include #include +#include #include "KingSystem/ActorSystem/actBaseProcJob.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/ActorSystem/actBaseProcMgr.h b/src/KingSystem/ActorSystem/actBaseProcMgr.h index 6ac3a7622..26c5d97cd 100644 --- a/src/KingSystem/ActorSystem/actBaseProcMgr.h +++ b/src/KingSystem/ActorSystem/actBaseProcMgr.h @@ -1,6 +1,5 @@ #pragma once -#include #include #include #include @@ -12,6 +11,7 @@ #include #include #include +#include #include "KingSystem/ActorSystem/actBaseProc.h" #include "KingSystem/ActorSystem/actBaseProcJob.h" #include "KingSystem/ActorSystem/actBaseProcMap.h" diff --git a/src/KingSystem/Chemical/chmRigid.h b/src/KingSystem/Chemical/chmRigid.h index ad253c260..586c82654 100644 --- a/src/KingSystem/Chemical/chmRigid.h +++ b/src/KingSystem/Chemical/chmRigid.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include "KingSystem/Utils/Types.h" namespace ksys::chm { diff --git a/src/KingSystem/Chemical/chmRoot.h b/src/KingSystem/Chemical/chmRoot.h index 9d1dc88d6..48dd7a4ba 100644 --- a/src/KingSystem/Chemical/chmRoot.h +++ b/src/KingSystem/Chemical/chmRoot.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include "KingSystem/Chemical/chmRigid.h" #include "KingSystem/Chemical/chmShape.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Chemical/chmShape.h b/src/KingSystem/Chemical/chmShape.h index 9ceef11dc..12559f7a3 100644 --- a/src/KingSystem/Chemical/chmShape.h +++ b/src/KingSystem/Chemical/chmShape.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include #include +#include +#include +#include +#include #include "KingSystem/Utils/Types.h" namespace ksys::chm { diff --git a/src/KingSystem/Chemical/chmSystemConfig.h b/src/KingSystem/Chemical/chmSystemConfig.h index 3db342b71..053fae078 100644 --- a/src/KingSystem/Chemical/chmSystemConfig.h +++ b/src/KingSystem/Chemical/chmSystemConfig.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include namespace ksys::chm { diff --git a/src/KingSystem/Mii/miiUMii.h b/src/KingSystem/Mii/miiUMii.h index f1fb83dec..554dec950 100644 --- a/src/KingSystem/Mii/miiUMii.h +++ b/src/KingSystem/Mii/miiUMii.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include #include +#include +#include +#include #include "KingSystem/Resource/resHandle.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Physics/Cloth/physClothParam.h b/src/KingSystem/Physics/Cloth/physClothParam.h index 9eecaffce..84a269443 100644 --- a/src/KingSystem/Physics/Cloth/physClothParam.h +++ b/src/KingSystem/Physics/Cloth/physClothParam.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include #include #include +#include +#include +#include namespace ksys::phys { diff --git a/src/KingSystem/Physics/Ragdoll/physRagdollConfig.h b/src/KingSystem/Physics/Ragdoll/physRagdollConfig.h index 031db8cc5..0faa34260 100644 --- a/src/KingSystem/Physics/Ragdoll/physRagdollConfig.h +++ b/src/KingSystem/Physics/Ragdoll/physRagdollConfig.h @@ -1,12 +1,12 @@ #pragma once -#include -#include -#include #include #include #include #include +#include +#include +#include namespace ksys::phys { diff --git a/src/KingSystem/Physics/Ragdoll/physRagdollControllerKeyList.h b/src/KingSystem/Physics/Ragdoll/physRagdollControllerKeyList.h index 5fbe7a846..d3ce3a6c3 100644 --- a/src/KingSystem/Physics/Ragdoll/physRagdollControllerKeyList.h +++ b/src/KingSystem/Physics/Ragdoll/physRagdollControllerKeyList.h @@ -1,8 +1,8 @@ #pragma once -#include -#include #include +#include +#include #include "KingSystem/Resource/resResource.h" diff --git a/src/KingSystem/Physics/Ragdoll/physRagdollParam.h b/src/KingSystem/Physics/Ragdoll/physRagdollParam.h index 42500ed7c..67d570213 100644 --- a/src/KingSystem/Physics/Ragdoll/physRagdollParam.h +++ b/src/KingSystem/Physics/Ragdoll/physRagdollParam.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include #include +#include +#include +#include namespace ksys::phys { diff --git a/src/KingSystem/Physics/RigidBody/Shape/Box/physBoxShape.cpp b/src/KingSystem/Physics/RigidBody/Shape/Box/physBoxShape.cpp index 1226372b8..1ded03e0d 100644 --- a/src/KingSystem/Physics/RigidBody/Shape/Box/physBoxShape.cpp +++ b/src/KingSystem/Physics/RigidBody/Shape/Box/physBoxShape.cpp @@ -11,9 +11,9 @@ BoxShape* BoxShape::make(const BoxShapeParam& param, sead::Heap* heap) { hkpBoxShape* box = nullptr; if (auto* storage = util::allocStorage(heap)) { const auto radius = param.convex_radius; - const hkVector4f half_extents{sead::Mathf::max(param.extents.x / 2 - radius, 0.001), - sead::Mathf::max(param.extents.y / 2 - radius, 0.001), - sead::Mathf::max(param.extents.z / 2 - radius, 0.001)}; + const hkVector4f half_extents{sead::Mathf::clampMin(param.extents.x / 2 - radius, 0.001), + sead::Mathf::clampMin(param.extents.y / 2 - radius, 0.001), + sead::Mathf::clampMin(param.extents.z / 2 - radius, 0.001)}; box = new (storage) hkpBoxShape(half_extents, radius); } @@ -122,9 +122,10 @@ const hkpShape* BoxShape::updateHavokShape() { if (mFlags.isOn(Flag::Dirty)) { { const auto radius = mHavokShape->getRadius(); - const sead::Vector3f half_extents{sead::Mathf::max(mExtents.x / 2 - radius, 0.001), - sead::Mathf::max(mExtents.y / 2 - radius, 0.001), - sead::Mathf::max(mExtents.z / 2 - radius, 0.001)}; + const sead::Vector3f half_extents{ + sead::Mathf::clampMin(mExtents.x / 2 - radius, 0.001), + sead::Mathf::clampMin(mExtents.y / 2 - radius, 0.001), + sead::Mathf::clampMin(mExtents.z / 2 - radius, 0.001)}; const auto ref_count = mHavokShape->getReferenceCount(); mHavokShape = new (mHavokShape) hkpBoxShape(toHkVec4(half_extents), radius); mHavokShape->setReferenceCount(ref_count); diff --git a/src/KingSystem/Physics/RigidBody/Shape/physShapeParamObj.h b/src/KingSystem/Physics/RigidBody/Shape/physShapeParamObj.h index f999f9fe4..5acbc5b42 100644 --- a/src/KingSystem/Physics/RigidBody/Shape/physShapeParamObj.h +++ b/src/KingSystem/Physics/RigidBody/Shape/physShapeParamObj.h @@ -1,9 +1,9 @@ #pragma once -#include -#include #include #include +#include +#include #include "KingSystem/Physics/physDefines.h" namespace ksys::phys { diff --git a/src/KingSystem/Physics/RigidBody/physEdgeRigidBodyParam.h b/src/KingSystem/Physics/RigidBody/physEdgeRigidBodyParam.h index a99a3dd30..c3d3d4589 100644 --- a/src/KingSystem/Physics/RigidBody/physEdgeRigidBodyParam.h +++ b/src/KingSystem/Physics/RigidBody/physEdgeRigidBodyParam.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include #include +#include +#include +#include namespace ksys::phys { diff --git a/src/KingSystem/Physics/RigidBody/physRigidBody.cpp b/src/KingSystem/Physics/RigidBody/physRigidBody.cpp index 5a67d445f..175dac29b 100644 --- a/src/KingSystem/Physics/RigidBody/physRigidBody.cpp +++ b/src/KingSystem/Physics/RigidBody/physRigidBody.cpp @@ -84,9 +84,9 @@ bool RigidBody::initMotionAccessorForDynamicMotion(sead::Heap* heap) { hkMatrix3 inertia; body->getInertiaLocal(inertia); - param.inertia = {sead::Mathf::max(inertia(0, 0), MinInertia), - sead::Mathf::max(inertia(1, 1), MinInertia), - sead::Mathf::max(inertia(2, 2), MinInertia)}; + param.inertia = {sead::Mathf::clampMin(inertia(0, 0), MinInertia), + sead::Mathf::clampMin(inertia(1, 1), MinInertia), + sead::Mathf::clampMin(inertia(2, 2), MinInertia)}; param.center_of_mass = toVec3(body->getCenterOfMassLocal()); param.linear_damping = body->getLinearDamping(); param.angular_damping = body->getAngularDamping(); @@ -126,9 +126,9 @@ bool RigidBody::createMotion(hkpMaxSizeMotion* motion, MotionType motion_type, case MotionType::Dynamic: { hkMatrix3f inertia_local; - inertia_local.m_col0.set(sead::Mathf::max(param.inertia.x, MinInertia), 0, 0); - inertia_local.m_col1.set(0, sead::Mathf::max(param.inertia.y, MinInertia), 0); - inertia_local.m_col2.set(0, 0, sead::Mathf::max(param.inertia.z, MinInertia)); + inertia_local.m_col0.set(sead::Mathf::clampMin(param.inertia.x, MinInertia), 0, 0); + inertia_local.m_col1.set(0, sead::Mathf::clampMin(param.inertia.y, MinInertia), 0); + inertia_local.m_col2.set(0, 0, sead::Mathf::clampMin(param.inertia.z, MinInertia)); hkpRigidBody::createDynamicRigidMotion( hkpMotion::MOTION_DYNAMIC, position, rotation, param.mass, inertia_local, @@ -1630,7 +1630,7 @@ bool RigidBody::isEntityMotionFlag80On() const { void RigidBody::setColImpulseScale(float scale) { if (!isEntity()) return; - scale = sead::Mathf::max(scale, 0.0); + scale = sead::Mathf::clampMin(scale, 0.0); getEntityMotionAccessor()->setColImpulseScale(scale); } diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyMotionEntity.cpp b/src/KingSystem/Physics/RigidBody/physRigidBodyMotionEntity.cpp index 3be3e533c..9820d86b6 100644 --- a/src/KingSystem/Physics/RigidBody/physRigidBodyMotionEntity.cpp +++ b/src/KingSystem/Physics/RigidBody/physRigidBodyMotionEntity.cpp @@ -300,14 +300,6 @@ float RigidBodyMotionEntity::getMassInv() const { return mMotion->getMassInv(); } -static inline float max3(float a, float b, float c) { - return sead::Mathf::max(c, a > b ? a : b); -} - -static inline float min3(float a, float b, float c) { - return sead::Mathf::min(a < b ? a : b, c); -} - void RigidBodyMotionEntity::setInertiaLocal(const sead::Vector3f& inertia) { if (mBody->isCharacterControllerType()) return; @@ -317,8 +309,8 @@ void RigidBodyMotionEntity::setInertiaLocal(const sead::Vector3f& inertia) { return; } - const float max = max3(inertia.x, inertia.y, inertia.z); - const float min = min3(inertia.x, inertia.y, inertia.z); + const float max = sead::Mathf::max3(inertia.x, inertia.y, inertia.z); + const float min = sead::Mathf::min3(inertia.x, inertia.y, inertia.z); const float threshold = max * 0.8f; bool need_to_recreate_motion = false; diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyParam.h b/src/KingSystem/Physics/RigidBody/physRigidBodyParam.h index b2d4b7db8..cc9ec49ac 100644 --- a/src/KingSystem/Physics/RigidBody/physRigidBodyParam.h +++ b/src/KingSystem/Physics/RigidBody/physRigidBodyParam.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include #include #include +#include +#include +#include #include "KingSystem/Physics/RigidBody/Shape/physShape.h" #include "KingSystem/Physics/physDefines.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodySetParam.h b/src/KingSystem/Physics/RigidBody/physRigidBodySetParam.h index 0297aa0b0..5602ad1c0 100644 --- a/src/KingSystem/Physics/RigidBody/physRigidBodySetParam.h +++ b/src/KingSystem/Physics/RigidBody/physRigidBodySetParam.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include #include +#include +#include +#include namespace ksys::phys { diff --git a/src/KingSystem/Physics/SupportBone/physSupportBoneParam.h b/src/KingSystem/Physics/SupportBone/physSupportBoneParam.h index b5b1e4a3c..00816d900 100644 --- a/src/KingSystem/Physics/SupportBone/physSupportBoneParam.h +++ b/src/KingSystem/Physics/SupportBone/physSupportBoneParam.h @@ -1,8 +1,8 @@ #pragma once -#include -#include #include +#include +#include namespace ksys::phys { diff --git a/src/KingSystem/Physics/SupportBone/physSupportBoneResource.h b/src/KingSystem/Physics/SupportBone/physSupportBoneResource.h index da19e5f73..d0af662a0 100644 --- a/src/KingSystem/Physics/SupportBone/physSupportBoneResource.h +++ b/src/KingSystem/Physics/SupportBone/physSupportBoneResource.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include "KingSystem/Utils/Types.h" namespace ksys::phys { diff --git a/src/KingSystem/Physics/System/physCharacterControllerParam.h b/src/KingSystem/Physics/System/physCharacterControllerParam.h index 47aa0532e..697bc97f9 100644 --- a/src/KingSystem/Physics/System/physCharacterControllerParam.h +++ b/src/KingSystem/Physics/System/physCharacterControllerParam.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include #include #include +#include +#include +#include namespace ksys::phys { diff --git a/src/KingSystem/Physics/System/physContactInfoParam.h b/src/KingSystem/Physics/System/physContactInfoParam.h index b6dc5df98..71830afce 100644 --- a/src/KingSystem/Physics/System/physContactInfoParam.h +++ b/src/KingSystem/Physics/System/physContactInfoParam.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include #include +#include +#include +#include namespace ksys::phys { diff --git a/src/KingSystem/Physics/System/physContactMgr.cpp b/src/KingSystem/Physics/System/physContactMgr.cpp index ccc253857..7872f3ef0 100644 --- a/src/KingSystem/Physics/System/physContactMgr.cpp +++ b/src/KingSystem/Physics/System/physContactMgr.cpp @@ -551,19 +551,20 @@ void ContactMgr::setImpulseEntryContactInfo(RigidBody* body_a, RigidBody* body_b const auto relative_vel = linvel_a - linvel_b; const auto dot_neg = [&](const auto& vec) { return vec.dot(-contact_point_normal); }; - float magnitude = is_flag_off ? sead::Mathf::max(0.0, relative_vel.dot(-contact_point_normal)) : - sead::Mathf::max(0.0, relative_vel.length()); + float magnitude = is_flag_off ? + sead::Mathf::clampMin(0.0, relative_vel.dot(-contact_point_normal)) : + sead::Mathf::clampMin(0.0, relative_vel.length()); if (magnitude >= entry->magnitude) { float i1, i2; if (is_flag_off) { - i1 = sead::Mathf::min(sead::Mathf::max(0.0, dot_neg(linvel_a)), magnitude); - i2 = sead::Mathf::min(sead::Mathf::max(0.0, linvel_b.dot(contact_point_normal)), - sead::Mathf::max(0.0, dot_neg(relative_vel))); + i1 = sead::Mathf::min(sead::Mathf::clampMin(0.0, dot_neg(linvel_a)), magnitude); + i2 = sead::Mathf::min(sead::Mathf::clampMin(0.0, linvel_b.dot(contact_point_normal)), + sead::Mathf::clampMin(0.0, dot_neg(relative_vel))); } else { - i1 = sead::Mathf::min(sead::Mathf::max(0.0, linvel_a.length()), magnitude); - i2 = sead::Mathf::min(sead::Mathf::max(0.0, linvel_b.length()), - sead::Mathf::max(0.0, relative_vel.length())); + i1 = sead::Mathf::min(sead::Mathf::clampMin(0.0, linvel_a.length()), magnitude); + i2 = sead::Mathf::min(sead::Mathf::clampMin(0.0, linvel_b.length()), + sead::Mathf::clampMin(0.0, relative_vel.length())); } entry->magnitude = magnitude; diff --git a/src/KingSystem/Physics/System/physContactMgr.h b/src/KingSystem/Physics/System/physContactMgr.h index 4ffe2fc93..421342b42 100644 --- a/src/KingSystem/Physics/System/physContactMgr.h +++ b/src/KingSystem/Physics/System/physContactMgr.h @@ -1,10 +1,5 @@ #pragma once -#include -#include -#include -#include -#include #include #include #include @@ -13,6 +8,11 @@ #include #include #include +#include +#include +#include +#include +#include #include "KingSystem/Physics/physDefines.h" #include "KingSystem/Physics/physMaterialMask.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Physics/System/physMaterialTable.h b/src/KingSystem/Physics/System/physMaterialTable.h index 2e917120d..da0fb540f 100644 --- a/src/KingSystem/Physics/System/physMaterialTable.h +++ b/src/KingSystem/Physics/System/physMaterialTable.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include "KingSystem/Physics/physDefines.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Physics/System/physParamSet.h b/src/KingSystem/Physics/System/physParamSet.h index 36a05c5bd..c50fe5f52 100644 --- a/src/KingSystem/Physics/System/physParamSet.h +++ b/src/KingSystem/Physics/System/physParamSet.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include #include +#include +#include +#include namespace ksys::res { class Physics; diff --git a/src/KingSystem/Physics/System/physSystemData.h b/src/KingSystem/Physics/System/physSystemData.h index ead0862cd..de15cc5b6 100644 --- a/src/KingSystem/Physics/System/physSystemData.h +++ b/src/KingSystem/Physics/System/physSystemData.h @@ -1,12 +1,12 @@ #pragma once -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include #include "KingSystem/Physics/physDefines.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Quest/qstManager.h b/src/KingSystem/Quest/qstManager.h index a2f994611..c72e72ced 100644 --- a/src/KingSystem/Quest/qstManager.h +++ b/src/KingSystem/Quest/qstManager.h @@ -3,9 +3,9 @@ #include #include #include +#include #include "KingSystem/Quest/qstQuest.h" #include "KingSystem/Resource/resHandle.h" -#include "agl/utl/aglParameter.h" namespace ksys::qst { diff --git a/src/KingSystem/Quest/qstQuest.cpp b/src/KingSystem/Quest/qstQuest.cpp index 667b62165..dffa196f4 100644 --- a/src/KingSystem/Quest/qstQuest.cpp +++ b/src/KingSystem/Quest/qstQuest.cpp @@ -1,5 +1,5 @@ #include "KingSystem/Quest/qstQuest.h" -#include "agl/utl/aglParameter.h" +#include namespace ksys::qst { diff --git a/src/KingSystem/Resource/Actor/resResourceAIProgram.cpp b/src/KingSystem/Resource/Actor/resResourceAIProgram.cpp index b221f1e33..bbe70ba1a 100644 --- a/src/KingSystem/Resource/Actor/resResourceAIProgram.cpp +++ b/src/KingSystem/Resource/Actor/resResourceAIProgram.cpp @@ -1,6 +1,6 @@ #include "KingSystem/Resource/Actor/resResourceAIProgram.h" -#include #include +#include #include "KingSystem/ActorSystem/actAiActionBase.h" #include "KingSystem/ActorSystem/actAiClassDef.h" #include "KingSystem/Resource/resCurrentResNameMgr.h" diff --git a/src/KingSystem/Resource/Actor/resResourceAIProgram.h b/src/KingSystem/Resource/Actor/resResourceAIProgram.h index 29c3d17eb..e9d89f9fb 100644 --- a/src/KingSystem/Resource/Actor/resResourceAIProgram.h +++ b/src/KingSystem/Resource/Actor/resResourceAIProgram.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include #include #include +#include +#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/Actor/resResourceAS.h b/src/KingSystem/Resource/Actor/resResourceAS.h index 531ca944c..ffcfaa3c0 100644 --- a/src/KingSystem/Resource/Actor/resResourceAS.h +++ b/src/KingSystem/Resource/Actor/resResourceAS.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include #include +#include +#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/Actor/resResourceASList.h b/src/KingSystem/Resource/Actor/resResourceASList.h index 5526577cd..0963075f7 100644 --- a/src/KingSystem/Resource/Actor/resResourceASList.h +++ b/src/KingSystem/Resource/Actor/resResourceASList.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include #include +#include +#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" diff --git a/src/KingSystem/Resource/Actor/resResourceASResource.h b/src/KingSystem/Resource/Actor/resResourceASResource.h index 825979066..4b07bde66 100644 --- a/src/KingSystem/Resource/Actor/resResourceASResource.h +++ b/src/KingSystem/Resource/Actor/resResourceASResource.h @@ -1,9 +1,9 @@ #pragma once -#include -#include #include #include +#include +#include #include "KingSystem/Resource/Actor/resResourceASResourceExtension.h" namespace ksys::res { diff --git a/src/KingSystem/Resource/Actor/resResourceASResourceExtension.h b/src/KingSystem/Resource/Actor/resResourceASResourceExtension.h index 4b39e2c4d..b88c6c622 100644 --- a/src/KingSystem/Resource/Actor/resResourceASResourceExtension.h +++ b/src/KingSystem/Resource/Actor/resResourceASResourceExtension.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include #include "KingSystem/Utils/Types.h" namespace sead { diff --git a/src/KingSystem/Resource/Actor/resResourceActorCapture.h b/src/KingSystem/Resource/Actor/resResourceActorCapture.h index 08cdd8e78..eda2e6a28 100644 --- a/src/KingSystem/Resource/Actor/resResourceActorCapture.h +++ b/src/KingSystem/Resource/Actor/resResourceActorCapture.h @@ -1,9 +1,9 @@ #pragma once -#include -#include #include #include +#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" diff --git a/src/KingSystem/Resource/Actor/resResourceActorLink.h b/src/KingSystem/Resource/Actor/resResourceActorLink.h index 7f13adc07..fb6e22515 100644 --- a/src/KingSystem/Resource/Actor/resResourceActorLink.h +++ b/src/KingSystem/Resource/Actor/resResourceActorLink.h @@ -1,8 +1,8 @@ #pragma once -#include -#include #include +#include +#include #include "KingSystem/ActorSystem/actTag.h" #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" diff --git a/src/KingSystem/Resource/Actor/resResourceAttCheck.h b/src/KingSystem/Resource/Actor/resResourceAttCheck.h index 92b5b3324..ec78be6ee 100644 --- a/src/KingSystem/Resource/Actor/resResourceAttCheck.h +++ b/src/KingSystem/Resource/Actor/resResourceAttCheck.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include #include +#include +#include +#include #include "resResourceAttClient.h" #include "resResourceAttPos.h" diff --git a/src/KingSystem/Resource/Actor/resResourceAttClient.h b/src/KingSystem/Resource/Actor/resResourceAttClient.h index 68ab66ff7..a9e5858c7 100644 --- a/src/KingSystem/Resource/Actor/resResourceAttClient.h +++ b/src/KingSystem/Resource/Actor/resResourceAttClient.h @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include #include #include +#include +#include +#include #include "KingSystem/ActorSystem/Attention/actAttention.h" #include "KingSystem/Resource/Actor/resResourceAttPos.h" #include "KingSystem/Resource/resResource.h" diff --git a/src/KingSystem/Resource/Actor/resResourceAttPos.h b/src/KingSystem/Resource/Actor/resResourceAttPos.h index ddb8bf00f..b2c438a68 100644 --- a/src/KingSystem/Resource/Actor/resResourceAttPos.h +++ b/src/KingSystem/Resource/Actor/resResourceAttPos.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include "KingSystem/Utils/Types.h" namespace ksys::res { diff --git a/src/KingSystem/Resource/Actor/resResourceAwareness.h b/src/KingSystem/Resource/Actor/resResourceAwareness.h index 8abf3f30a..d7ddc5918 100644 --- a/src/KingSystem/Resource/Actor/resResourceAwareness.h +++ b/src/KingSystem/Resource/Actor/resResourceAwareness.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" diff --git a/src/KingSystem/Resource/Actor/resResourceBoneControl.h b/src/KingSystem/Resource/Actor/resResourceBoneControl.h index 9e2cd211a..0a99a2799 100644 --- a/src/KingSystem/Resource/Actor/resResourceBoneControl.h +++ b/src/KingSystem/Resource/Actor/resResourceBoneControl.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include #include #include #include +#include +#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/Actor/resResourceDamageParam.h b/src/KingSystem/Resource/Actor/resResourceDamageParam.h index db4d93eb5..4ea19e00e 100644 --- a/src/KingSystem/Resource/Actor/resResourceDamageParam.h +++ b/src/KingSystem/Resource/Actor/resResourceDamageParam.h @@ -1,7 +1,7 @@ -#include -#include #include #include +#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" diff --git a/src/KingSystem/Resource/Actor/resResourceDrop.h b/src/KingSystem/Resource/Actor/resResourceDrop.h index 267a239c7..dcb378f9b 100644 --- a/src/KingSystem/Resource/Actor/resResourceDrop.h +++ b/src/KingSystem/Resource/Actor/resResourceDrop.h @@ -1,8 +1,8 @@ #pragma once -#include -#include #include +#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/Actor/resResourceGParamList.cpp b/src/KingSystem/Resource/Actor/resResourceGParamList.cpp index 4bd2ad5d5..a7e68de32 100644 --- a/src/KingSystem/Resource/Actor/resResourceGParamList.cpp +++ b/src/KingSystem/Resource/Actor/resResourceGParamList.cpp @@ -1,6 +1,6 @@ #include "KingSystem/Resource/Actor/resResourceGParamList.h" -#include #include +#include #include "KingSystem/ActorSystem/actActorParamMgr.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Resource/GeneralParamList/resGParamListObjectAirWall.h" diff --git a/src/KingSystem/Resource/Actor/resResourceLifeCondition.h b/src/KingSystem/Resource/Actor/resResourceLifeCondition.h index 7b69f6c95..00ec3c59e 100644 --- a/src/KingSystem/Resource/Actor/resResourceLifeCondition.h +++ b/src/KingSystem/Resource/Actor/resResourceLifeCondition.h @@ -1,8 +1,8 @@ #pragma once -#include -#include #include +#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" diff --git a/src/KingSystem/Resource/Actor/resResourceLod.h b/src/KingSystem/Resource/Actor/resResourceLod.h index 932798d35..8c6ece1ed 100644 --- a/src/KingSystem/Resource/Actor/resResourceLod.h +++ b/src/KingSystem/Resource/Actor/resResourceLod.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" diff --git a/src/KingSystem/Resource/Actor/resResourceModelList.h b/src/KingSystem/Resource/Actor/resResourceModelList.h index 298af40f2..8c79e8366 100644 --- a/src/KingSystem/Resource/Actor/resResourceModelList.h +++ b/src/KingSystem/Resource/Actor/resResourceModelList.h @@ -1,9 +1,9 @@ #pragma once -#include -#include #include #include +#include +#include #include "KingSystem/ActorSystem/actInfoData.h" #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" diff --git a/src/KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h b/src/KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h index 02cb846b4..21735ef4f 100644 --- a/src/KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h +++ b/src/KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include #include +#include +#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" diff --git a/src/KingSystem/Resource/Actor/resResourceRagdollConfigList.h b/src/KingSystem/Resource/Actor/resResourceRagdollConfigList.h index 6c4cb5d73..3414278d0 100644 --- a/src/KingSystem/Resource/Actor/resResourceRagdollConfigList.h +++ b/src/KingSystem/Resource/Actor/resResourceRagdollConfigList.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include #include +#include +#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/Actor/resResourceRecipe.h b/src/KingSystem/Resource/Actor/resResourceRecipe.h index 175d2d261..1c148a572 100644 --- a/src/KingSystem/Resource/Actor/resResourceRecipe.h +++ b/src/KingSystem/Resource/Actor/resResourceRecipe.h @@ -1,8 +1,8 @@ #pragma once -#include -#include #include +#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/Actor/resResourceShop.h b/src/KingSystem/Resource/Actor/resResourceShop.h index 97fcfde9c..777a3c490 100644 --- a/src/KingSystem/Resource/Actor/resResourceShop.h +++ b/src/KingSystem/Resource/Actor/resResourceShop.h @@ -1,8 +1,8 @@ #pragma once -#include -#include #include +#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" diff --git a/src/KingSystem/Resource/Actor/resResourceUMii.h b/src/KingSystem/Resource/Actor/resResourceUMii.h index 9f023f6fb..d9756490f 100644 --- a/src/KingSystem/Resource/Actor/resResourceUMii.h +++ b/src/KingSystem/Resource/Actor/resResourceUMii.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/resResource.h" #include "KingSystem/Utils/ParamIO.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/Event/resResourceDemo.h b/src/KingSystem/Resource/Event/resResourceDemo.h index b9d89b849..9575e4308 100644 --- a/src/KingSystem/Resource/Event/resResourceDemo.h +++ b/src/KingSystem/Resource/Event/resResourceDemo.h @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include #include +#include +#include +#include #include "KingSystem/Utils/Types.h" namespace ksys::res { diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObject.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObject.h index 4ad46e45c..640a2cc84 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObject.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObject.h @@ -1,7 +1,7 @@ #pragma once -#include #include +#include #include "KingSystem/Utils/Types.h" namespace ksys::res { diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAirWall.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAirWall.h index b2f7a224e..644da7407 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAirWall.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAirWall.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalFollowOffset.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalFollowOffset.h index 26ae8c14a..077cf5395 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalFollowOffset.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalFollowOffset.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalUnit.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalUnit.h index 2a707244a..69bfbcf6d 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalUnit.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalUnit.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h index 9029a02bd..f388f91d0 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h index c53b01bc5..8da2e612f 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorHead.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorHead.h index 6a5a83552..eb028f7fc 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorHead.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorHead.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorUpper.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorUpper.h index 01579bb5e..c7d52dd79 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorUpper.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorUpper.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArrow.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArrow.h index 0bc0d6de2..cbc7bc279 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArrow.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArrow.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h index 61764e381..203b1e700 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h index 5098c7179..a5b946653 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAutoGen.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAutoGen.h index eb50bc527..8f693c376 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAutoGen.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAutoGen.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBeam.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBeam.h index fae695b45..0dab8fc39 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBeam.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBeam.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h index 6b93c7bfa..1b23532ba 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h index cfd70118b..08b61e084 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h index 4e6de79b5..66ef8863f 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBullet.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBullet.h index 133dfc9cb..05ea82250 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBullet.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBullet.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCamera.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCamera.h index d61b475a5..e358865aa 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCamera.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCamera.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectChemicalType.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectChemicalType.h index b865c5096..c0a3484b3 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectChemicalType.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectChemicalType.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectClothReaction.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectClothReaction.h index 01f2ab78f..8b5e402c4 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectClothReaction.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectClothReaction.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCookSpice.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCookSpice.h index 3e4c16187..9b1d18360 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCookSpice.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCookSpice.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCureItem.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCureItem.h index 14b97e61a..c15d117c1 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCureItem.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCureItem.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEatTarget.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEatTarget.h index 71fe8e1d1..2dc5a4101 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEatTarget.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEatTarget.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h index 9ab0882f0..63cecb4c9 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h index dfa1147fb..238378bbf 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h index 02a046da5..6cfa562d4 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h index a72c6b914..aa786d9fb 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEvent.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEvent.h index 9c8039b09..46a98dc8b 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEvent.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEvent.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h index 011855ae1..f846bd02e 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectFish.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectFish.h index 5712a38e3..7197d34b0 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectFish.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectFish.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGelEnemy.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGelEnemy.h index 227c5fcd5..91b4b2927 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGelEnemy.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGelEnemy.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h index d59faa7d2..abde1b008 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h index a0298b8f8..0a7e40e3f 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmorSlot.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmorSlot.h index cb35cba2a..02578ed59 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmorSlot.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmorSlot.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGlobal.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGlobal.h index 857442ad0..c20c8a691 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGlobal.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGlobal.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolem.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolem.h index 33ccbc23c..96316f978 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolem.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolem.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolemIK.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolemIK.h index 27235cacf..ca4c040f0 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolemIK.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolemIK.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h index 3b34bfda6..f748cf3d7 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardian.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardian.h index c3cc54b62..c36b9dc02 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardian.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardian.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMini.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMini.h index 39043a398..41c3d02f2 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMini.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMini.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h index f7cd4d7aa..17b711b8f 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorse.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorse.h index 7bedd55b8..adcd565f0 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorse.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorse.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseCreator.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseCreator.h index f3e136cb7..107e98674 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseCreator.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseCreator.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseObject.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseObject.h index 38464832f..20acdef32 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseObject.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseObject.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseRider.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseRider.h index 40a84957e..3edcd0d82 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseRider.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseRider.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseTargetedInfo.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseTargetedInfo.h index 2180db166..ad68f7df8 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseTargetedInfo.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseTargetedInfo.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseUnit.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseUnit.h index df4761b39..c297a113a 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseUnit.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseUnit.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectInsect.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectInsect.h index b741f7b4a..8b52193f9 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectInsect.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectInsect.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectItem.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectItem.h index 52a2d4c75..9e9002c71 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectItem.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectItem.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h index 012f138ec..d275aad76 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h index 7b3c3eb8c..ff05fd3d6 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h index cc7150833..62be2f410 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h index 6d512afa1..2261dfd68 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMonsterShop.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMonsterShop.h index 1140a5c54..4ca5fba02 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMonsterShop.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMonsterShop.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMotorcycle.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMotorcycle.h index dcb1b8deb..3381c3cba 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMotorcycle.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMotorcycle.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNest.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNest.h index b0276842e..623081f72 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNest.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNest.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpc.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpc.h index a758b7352..37de85add 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpc.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpc.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpcEquipment.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpcEquipment.h index df8026f37..cc4db37d9 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpcEquipment.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpcEquipment.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPictureBook.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPictureBook.h index 61193cf1b..d8eb4e153 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPictureBook.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPictureBook.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h index a4b788d8c..e5f22a7ba 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPrey.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPrey.h index 416026826..bcbe5ce34 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPrey.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPrey.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h index dbc92009d..bfa3a9d93 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRope.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRope.h index e52859c3a..0a7135038 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRope.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRope.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRupee.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRupee.h index 16544e60f..a360bc51b 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRupee.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRupee.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h index 0dc2d61f1..54cc02937 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h index 49a6dd831..0a94e60bf 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h index 6495ad83b..4ed85db56 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h index ea7d2ef5f..3e2de264f 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h index bfb774d7a..99f65da09 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h index 7c4577da3..643741210 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectStalEnemy.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectStalEnemy.h index 85887c48f..6bb71c75b 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectStalEnemy.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectStalEnemy.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSwarm.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSwarm.h index eaf2824f0..d8107dd5d 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSwarm.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSwarm.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h index c19e96a1c..add5450a8 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h index 372a36004..5af115cfe 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h index 575d01ff2..cdf72901c 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h index 553750f28..9789ebf1d 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponThrow.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponThrow.h index c20ca67ce..8be4b2c8e 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponThrow.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponThrow.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWizzrobe.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWizzrobe.h index 1a58bcd65..4fd0986ee 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWizzrobe.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWizzrobe.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWolfLink.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWolfLink.h index 0098706cb..950b7a8e4 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWolfLink.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWolfLink.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectZora.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectZora.h index 31cd02bdf..988582441 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectZora.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectZora.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/Resource/resResourceASSetting.h b/src/KingSystem/Resource/resResourceASSetting.h index 6f4a3f12b..c94621992 100644 --- a/src/KingSystem/Resource/resResourceASSetting.h +++ b/src/KingSystem/Resource/resResourceASSetting.h @@ -1,14 +1,14 @@ #pragma once -#include -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include +#include #include "KingSystem/Resource/Actor/resResourceASResourceExtension.h" #include "KingSystem/Resource/resResource.h" diff --git a/src/KingSystem/Sound/sndMusicDefinition.h b/src/KingSystem/Sound/sndMusicDefinition.h index acfd216c3..d5275aa55 100644 --- a/src/KingSystem/Sound/sndMusicDefinition.h +++ b/src/KingSystem/Sound/sndMusicDefinition.h @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include "KingSystem/Utils/Types.h" namespace ksys::snd { diff --git a/src/KingSystem/Sound/sndMusicInfo.h b/src/KingSystem/Sound/sndMusicInfo.h index 86062bd64..4447a7679 100644 --- a/src/KingSystem/Sound/sndMusicInfo.h +++ b/src/KingSystem/Sound/sndMusicInfo.h @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/System/VFR.cpp b/src/KingSystem/System/VFR.cpp index f2ae8d1f8..0c53d41d9 100644 --- a/src/KingSystem/System/VFR.cpp +++ b/src/KingSystem/System/VFR.cpp @@ -21,7 +21,7 @@ VFR::~VFR() { } void VFR::setDelta(u32 core, f32 delta) { - delta = sead::Mathf::max(delta, 0.01f); + delta = sead::Mathf::clampMin(delta, 0.01f); *mRawDeltaFrames[core] = delta; *mDeltaFrames[core] = delta * *mIntervalRatios[core]; *mRawDeltaTimes[core] = delta * mFrameTime; @@ -111,7 +111,7 @@ void VFR::TimeSpeedMultiplier::update(f32 multiplier) { if (target_value < value) { value = target_value; } else { - sead::Mathf::chase(&value, target_value, sead::Mathf::max(value * multiplier, 0.01)); + sead::Mathf::chase(&value, target_value, sead::Mathf::clampMin(value * multiplier, 0.01)); } } diff --git a/src/KingSystem/System/VideoRecorder.h b/src/KingSystem/System/VideoRecorder.h index 79ab300f4..bdd06f2e7 100644 --- a/src/KingSystem/System/VideoRecorder.h +++ b/src/KingSystem/System/VideoRecorder.h @@ -1,9 +1,9 @@ #pragma once -#include #include #include #include +#include #include "KingSystem/Utils/Types.h" namespace ksys { @@ -28,4 +28,4 @@ class VideoRecorder { KSYS_CHECK_SIZE_NX150(VideoRecorder, 0x148); -} // namespace ksys \ No newline at end of file +} // namespace ksys diff --git a/src/KingSystem/Utils/ParamIO.cpp b/src/KingSystem/Utils/ParamIO.cpp index d98d4d946..2a95c1185 100644 --- a/src/KingSystem/Utils/ParamIO.cpp +++ b/src/KingSystem/Utils/ParamIO.cpp @@ -1,6 +1,6 @@ #include "KingSystem/Utils/ParamIO.h" -#include #include +#include #include "KingSystem/ActorSystem/actActorParamMgr.h" namespace ksys { diff --git a/src/KingSystem/Utils/ParamIO.h b/src/KingSystem/Utils/ParamIO.h index 7ffb43a02..02ff3546e 100644 --- a/src/KingSystem/Utils/ParamIO.h +++ b/src/KingSystem/Utils/ParamIO.h @@ -1,9 +1,9 @@ #pragma once -#include #include #include #include +#include #include "KingSystem/Utils/Types.h" namespace ksys { diff --git a/src/KingSystem/World/worldDofMgr.h b/src/KingSystem/World/worldDofMgr.h index 4c6f447a1..ce5d38a96 100644 --- a/src/KingSystem/World/worldDofMgr.h +++ b/src/KingSystem/World/worldDofMgr.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "KingSystem/Utils/Types.h" #include "KingSystem/World/worldJob.h" diff --git a/src/KingSystem/World/worldEnvMgr.h b/src/KingSystem/World/worldEnvMgr.h index 390cd857e..397ec4235 100644 --- a/src/KingSystem/World/worldEnvMgr.h +++ b/src/KingSystem/World/worldEnvMgr.h @@ -1,10 +1,10 @@ #pragma once -#include -#include #include #include #include +#include +#include #include "KingSystem/Utils/Types.h" #include "KingSystem/World/worldJob.h" diff --git a/src/KingSystem/World/worldManager.cpp b/src/KingSystem/World/worldManager.cpp index cd2d9853e..d92fa4705 100644 --- a/src/KingSystem/World/worldManager.cpp +++ b/src/KingSystem/World/worldManager.cpp @@ -140,7 +140,7 @@ float Manager::calcTempDay(float height) const { float normal_temp = 23.0f; if (isMainField() && worldInfoLoaded()) { - height = sead::Mathf::max(height, 0.0f); + height = sead::Mathf::clampMin(height, 0.0f); int a = -1; float h{}; @@ -182,7 +182,7 @@ float Manager::calcTempNight(float height) const { float normal_temp = 23.0f; if (isMainField() && worldInfoLoaded()) { - height = sead::Mathf::max(height, 0.0f); + height = sead::Mathf::clampMin(height, 0.0f); int a = -1; float h{}; diff --git a/src/KingSystem/World/worldManager.h b/src/KingSystem/World/worldManager.h index 4f35fd423..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" diff --git a/src/KingSystem/World/worldSkyMgr.h b/src/KingSystem/World/worldSkyMgr.h index 8d43be2bd..534d87d06 100644 --- a/src/KingSystem/World/worldSkyMgr.h +++ b/src/KingSystem/World/worldSkyMgr.h @@ -1,9 +1,9 @@ #pragma once -#include -#include #include #include +#include +#include #include "KingSystem/Utils/Types.h" #include "KingSystem/World/worldJob.h" diff --git a/src/KingSystem/World/worldTimeMgr.cpp b/src/KingSystem/World/worldTimeMgr.cpp index 39e213bc7..2cb5d0915 100644 --- a/src/KingSystem/World/worldTimeMgr.cpp +++ b/src/KingSystem/World/worldTimeMgr.cpp @@ -327,7 +327,7 @@ void TimeMgr::calc_() { if (!mFindDungeonActivated && mTime >= 11_h) mTime = 11_h; - _d0 = sead::Mathf::max(mTimeStep / DefaultTimeStep, 1.0); + _d0 = sead::Mathf::clampMin(mTimeStep / DefaultTimeStep, 1.0); mBloodMoonTimer += delta; break; }