diff options
157 files changed, 287 insertions, 294 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 31d6b045..3868a040 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 06a2cde2..f0689c44 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 -Subproject 8dce6534c41bf304ee9fc44fc99d3023c6fd12b +Subproject a7a1e2b715cbafbbe50264a6157da8388a39077 diff --git a/lib/agl b/lib/agl -Subproject 9731cfc5017f798aeca80a37fba17f3af17b807 +Subproject e00c665fb8f5d54c90e9f8559fcfd3eec2e888f diff --git a/lib/gsys/include/gsys/gsysLightRigObj.h b/lib/gsys/include/gsys/gsysLightRigObj.h index ad40f986..fbdca4a8 100644 --- a/lib/gsys/include/gsys/gsysLightRigObj.h +++ b/lib/gsys/include/gsys/gsysLightRigObj.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/env/aglEnvObj.h> +#include <environment/aglEnvObj.h> namespace gsys { diff --git a/lib/gsys/include/gsys/gsysMaskedProjLight.h b/lib/gsys/include/gsys/gsysMaskedProjLight.h index 749b6328..652eb66c 100644 --- a/lib/gsys/include/gsys/gsysMaskedProjLight.h +++ b/lib/gsys/include/gsys/gsysMaskedProjLight.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/env/aglEnvObj.h> +#include <environment/aglEnvObj.h> namespace gsys { diff --git a/lib/gsys/include/gsys/gsysMaskedSpotLight.h b/lib/gsys/include/gsys/gsysMaskedSpotLight.h index 8a484aef..0b5b6387 100644 --- a/lib/gsys/include/gsys/gsysMaskedSpotLight.h +++ b/lib/gsys/include/gsys/gsysMaskedSpotLight.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/env/aglEnvObj.h> +#include <environment/aglEnvObj.h> namespace gsys { diff --git a/lib/gsys/include/gsys/gsysModelSceneConfig.h b/lib/gsys/include/gsys/gsysModelSceneConfig.h index bebe7966..958c9857 100644 --- a/lib/gsys/include/gsys/gsysModelSceneConfig.h +++ b/lib/gsys/include/gsys/gsysModelSceneConfig.h @@ -1,16 +1,16 @@ #pragma once -#include <agl/env/aglEnvObjBuffer.h> -#include <agl/env/aglEnvObjMgr.h> -#include <agl/env/aglEnvObjSetMgr.h> -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterObj.h> #include <basis/seadTypes.h> #include <container/seadSafeArray.h> +#include <environment/aglEnvObjBuffer.h> +#include <environment/aglEnvObjMgr.h> +#include <environment/aglEnvObjSetMgr.h> #include <hostio/seadHostIONode.h> #include <math/seadVector.h> #include <prim/seadSafeString.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterObj.h> namespace gsys { diff --git a/lib/gsys/include/gsys/gsysOfxLensFlareRig.h b/lib/gsys/include/gsys/gsysOfxLensFlareRig.h index 728d3616..f0b4d0a9 100644 --- a/lib/gsys/include/gsys/gsysOfxLensFlareRig.h +++ b/lib/gsys/include/gsys/gsysOfxLensFlareRig.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/env/aglEnvObj.h> +#include <environment/aglEnvObj.h> namespace gsys { diff --git a/lib/gsys/include/gsys/gsysParticleConfig.h b/lib/gsys/include/gsys/gsysParticleConfig.h index ecaf4fd6..ccfef4ec 100644 --- a/lib/gsys/include/gsys/gsysParticleConfig.h +++ b/lib/gsys/include/gsys/gsysParticleConfig.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterObj.h> #include <hostio/seadHostIONode.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterObj.h> namespace gsys { diff --git a/lib/gsys/include/gsys/gsysPointLight.h b/lib/gsys/include/gsys/gsysPointLight.h index d049e299..82b6d072 100644 --- a/lib/gsys/include/gsys/gsysPointLight.h +++ b/lib/gsys/include/gsys/gsysPointLight.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/env/aglEnvObj.h> +#include <environment/aglEnvObj.h> namespace gsys { diff --git a/lib/gsys/include/gsys/gsysSpotLight.h b/lib/gsys/include/gsys/gsysSpotLight.h index e68d3d46..0577f41b 100644 --- a/lib/gsys/include/gsys/gsysSpotLight.h +++ b/lib/gsys/include/gsys/gsysSpotLight.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/env/aglEnvObj.h> +#include <environment/aglEnvObj.h> namespace gsys { diff --git a/lib/gsys/src/gsys/gsysModelSceneConfig.cpp b/lib/gsys/src/gsys/gsysModelSceneConfig.cpp index b3e0f88b..b737a59c 100644 --- a/lib/gsys/src/gsys/gsysModelSceneConfig.cpp +++ b/lib/gsys/src/gsys/gsysModelSceneConfig.cpp @@ -1,13 +1,13 @@ #include "gsys/gsysModelSceneConfig.h" -#include <agl/detail/aglPrivateResource.h> -#include <agl/env/aglFog.h> -#include <agl/env/aglLight.h> -#include <agl/env/aglProjector.h> -#include <agl/pfx/aglBloom.h> -#include <agl/pfx/aglDepthOfField.h> #include <basis/seadRawPrint.h> +#include <detail/aglPrivateResource.h> +#include <environment/aglFog.h> +#include <environment/aglLight.h> +#include <environment/aglProjector.h> +#include <postfx/aglBloom.h> +#include <postfx/aglDepthOfField.h> #include <prim/seadEnum.h> -#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 -Subproject 1decfbfc7f23f11233db326d3796ba96c813fcf +Subproject 7a2b22a6a53f341b9752dd8134a9a6172fb7dad diff --git a/src/KingSystem/ActorSystem/Awareness/actAwareness.cpp b/src/KingSystem/ActorSystem/Awareness/actAwareness.cpp index 7eb1d243..4d4e8d67 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 <agl/utl/aglParameter.h> -#include <agl/utl/aglResParameter.h> #include <container/seadSafeArray.h> #include <cstring> #include <prim/seadScopedLock.h> +#include <utility/aglParameter.h> +#include <utility/aglResParameter.h> #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 5ade34dd..a6f3b30d 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 <agl/utl/aglParameter.h> #include <container/seadSafeArray.h> +#include <utility/aglParameter.h> namespace ksys::act { diff --git a/src/KingSystem/ActorSystem/actAiParam.cpp b/src/KingSystem/ActorSystem/actAiParam.cpp index c54affc6..fe35fb29 100644 --- a/src/KingSystem/ActorSystem/actAiParam.cpp +++ b/src/KingSystem/ActorSystem/actAiParam.cpp @@ -1,5 +1,5 @@ #include "KingSystem/ActorSystem/actAiParam.h" -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 8e8fd35f..9d098f06 100644 --- a/src/KingSystem/ActorSystem/actBaseProcJobQue.h +++ b/src/KingSystem/ActorSystem/actBaseProcJobQue.h @@ -1,12 +1,12 @@ #pragma once -#include <agl/utl/aglAtomicPtrArray.h> #include <array> #include <basis/seadTypes.h> #include <container/seadSafeArray.h> #include <mc/seadJob.h> #include <mc/seadJobQueue.h> #include <thread/seadAtomic.h> +#include <utility/aglAtomicPtrArray.h> #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 6ac3a762..26c5d97c 100644 --- a/src/KingSystem/ActorSystem/actBaseProcMgr.h +++ b/src/KingSystem/ActorSystem/actBaseProcMgr.h @@ -1,6 +1,5 @@ #pragma once -#include <agl/utl/aglAtomicPtrArray.h> #include <container/seadBuffer.h> #include <container/seadOffsetList.h> #include <container/seadPtrArray.h> @@ -12,6 +11,7 @@ #include <prim/seadTypedBitFlag.h> #include <thread/seadAtomic.h> #include <thread/seadCriticalSection.h> +#include <utility/aglAtomicPtrArray.h> #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 ad253c26..586c8265 100644 --- a/src/KingSystem/Chemical/chmRigid.h +++ b/src/KingSystem/Chemical/chmRigid.h @@ -1,7 +1,7 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #include "KingSystem/Utils/Types.h" namespace ksys::chm { diff --git a/src/KingSystem/Chemical/chmRoot.h b/src/KingSystem/Chemical/chmRoot.h index 9d1dc88d..48dd7a4b 100644 --- a/src/KingSystem/Chemical/chmRoot.h +++ b/src/KingSystem/Chemical/chmRoot.h @@ -1,11 +1,11 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> #include <hostio/seadHostIONode.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> #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 9ceef11d..12559f7a 100644 --- a/src/KingSystem/Chemical/chmShape.h +++ b/src/KingSystem/Chemical/chmShape.h @@ -1,10 +1,10 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <hostio/seadHostIONode.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> #include "KingSystem/Utils/Types.h" namespace ksys::chm { diff --git a/src/KingSystem/Chemical/chmSystemConfig.h b/src/KingSystem/Chemical/chmSystemConfig.h index 3db342b7..053fae07 100644 --- a/src/KingSystem/Chemical/chmSystemConfig.h +++ b/src/KingSystem/Chemical/chmSystemConfig.h @@ -1,13 +1,13 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <basis/seadTypes.h> #include <container/seadBuffer.h> #include <heap/seadDisposer.h> #include <hostio/seadHostIONode.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> namespace ksys::chm { diff --git a/src/KingSystem/Mii/miiUMii.h b/src/KingSystem/Mii/miiUMii.h index f1fb83de..554dec95 100644 --- a/src/KingSystem/Mii/miiUMii.h +++ b/src/KingSystem/Mii/miiUMii.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterObj.h> #include <prim/seadSafeString.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterObj.h> #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 9eecaffc..84a26944 100644 --- a/src/KingSystem/Physics/Cloth/physClothParam.h +++ b/src/KingSystem/Physics/Cloth/physClothParam.h @@ -1,10 +1,10 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> #include <prim/seadSafeString.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> namespace ksys::phys { diff --git a/src/KingSystem/Physics/Ragdoll/physRagdollConfig.h b/src/KingSystem/Physics/Ragdoll/physRagdollConfig.h index 031db8cc..0faa3426 100644 --- a/src/KingSystem/Physics/Ragdoll/physRagdollConfig.h +++ b/src/KingSystem/Physics/Ragdoll/physRagdollConfig.h @@ -1,12 +1,12 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadSafeArray.h> #include <hostio/seadHostIONode.h> #include <math/seadVector.h> #include <prim/seadSafeString.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterObj.h> namespace ksys::phys { diff --git a/src/KingSystem/Physics/Ragdoll/physRagdollControllerKeyList.h b/src/KingSystem/Physics/Ragdoll/physRagdollControllerKeyList.h index 5fbe7a84..d3ce3a6c 100644 --- a/src/KingSystem/Physics/Ragdoll/physRagdollControllerKeyList.h +++ b/src/KingSystem/Physics/Ragdoll/physRagdollControllerKeyList.h @@ -1,8 +1,8 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #include "KingSystem/Resource/resResource.h" diff --git a/src/KingSystem/Physics/Ragdoll/physRagdollParam.h b/src/KingSystem/Physics/Ragdoll/physRagdollParam.h index 42500ed7..67d57021 100644 --- a/src/KingSystem/Physics/Ragdoll/physRagdollParam.h +++ b/src/KingSystem/Physics/Ragdoll/physRagdollParam.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <prim/seadSafeString.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> namespace ksys::phys { diff --git a/src/KingSystem/Physics/RigidBody/Shape/physShapeParamObj.h b/src/KingSystem/Physics/RigidBody/Shape/physShapeParamObj.h index f999f9fe..5acbc5b4 100644 --- a/src/KingSystem/Physics/RigidBody/Shape/physShapeParamObj.h +++ b/src/KingSystem/Physics/RigidBody/Shape/physShapeParamObj.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> #include <prim/seadSafeString.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #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 a99a3dd3..c3d3d458 100644 --- a/src/KingSystem/Physics/RigidBody/physEdgeRigidBodyParam.h +++ b/src/KingSystem/Physics/RigidBody/physEdgeRigidBodyParam.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> namespace ksys::phys { diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyParam.h b/src/KingSystem/Physics/RigidBody/physRigidBodyParam.h index b2d4b7db..cc9ec49a 100644 --- a/src/KingSystem/Physics/RigidBody/physRigidBodyParam.h +++ b/src/KingSystem/Physics/RigidBody/physRigidBodyParam.h @@ -1,10 +1,10 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> #include <prim/seadRuntimeTypeInfo.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> #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 0297aa0b..5602ad1c 100644 --- a/src/KingSystem/Physics/RigidBody/physRigidBodySetParam.h +++ b/src/KingSystem/Physics/RigidBody/physRigidBodySetParam.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> namespace ksys::phys { diff --git a/src/KingSystem/Physics/SupportBone/physSupportBoneParam.h b/src/KingSystem/Physics/SupportBone/physSupportBoneParam.h index b5b1e4a3..00816d90 100644 --- a/src/KingSystem/Physics/SupportBone/physSupportBoneParam.h +++ b/src/KingSystem/Physics/SupportBone/physSupportBoneParam.h @@ -1,8 +1,8 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> #include <hostio/seadHostIONode.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> namespace ksys::phys { diff --git a/src/KingSystem/Physics/SupportBone/physSupportBoneResource.h b/src/KingSystem/Physics/SupportBone/physSupportBoneResource.h index da19e5f7..d0af662a 100644 --- a/src/KingSystem/Physics/SupportBone/physSupportBoneResource.h +++ b/src/KingSystem/Physics/SupportBone/physSupportBoneResource.h @@ -1,11 +1,11 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> #include <resource/seadResource.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> #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 47aa0532..697bc97f 100644 --- a/src/KingSystem/Physics/System/physCharacterControllerParam.h +++ b/src/KingSystem/Physics/System/physCharacterControllerParam.h @@ -1,10 +1,10 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> #include <prim/seadEnum.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> namespace ksys::phys { diff --git a/src/KingSystem/Physics/System/physContactInfoParam.h b/src/KingSystem/Physics/System/physContactInfoParam.h index b6dc5df9..71830afc 100644 --- a/src/KingSystem/Physics/System/physContactInfoParam.h +++ b/src/KingSystem/Physics/System/physContactInfoParam.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> namespace ksys::phys { diff --git a/src/KingSystem/Physics/System/physContactMgr.h b/src/KingSystem/Physics/System/physContactMgr.h index 4ffe2fc9..421342b4 100644 --- a/src/KingSystem/Physics/System/physContactMgr.h +++ b/src/KingSystem/Physics/System/physContactMgr.h @@ -1,10 +1,5 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> -#include <agl/utl/aglResParameter.h> #include <container/seadBuffer.h> #include <container/seadOffsetList.h> #include <container/seadSafeArray.h> @@ -13,6 +8,11 @@ #include <prim/seadScopedLock.h> #include <thread/seadAtomic.h> #include <thread/seadMutex.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> +#include <utility/aglResParameter.h> #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 2e917120..da0fb540 100644 --- a/src/KingSystem/Physics/System/physMaterialTable.h +++ b/src/KingSystem/Physics/System/physMaterialTable.h @@ -1,11 +1,11 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> -#include <agl/utl/aglResParameter.h> #include <container/seadSafeArray.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> +#include <utility/aglResParameter.h> #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 36a05c5b..c50fe5f5 100644 --- a/src/KingSystem/Physics/System/physParamSet.h +++ b/src/KingSystem/Physics/System/physParamSet.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> namespace ksys::res { class Physics; diff --git a/src/KingSystem/Physics/System/physSystemData.h b/src/KingSystem/Physics/System/physSystemData.h index ead0862c..de15cc5b 100644 --- a/src/KingSystem/Physics/System/physSystemData.h +++ b/src/KingSystem/Physics/System/physSystemData.h @@ -1,12 +1,12 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> -#include <agl/utl/aglResParameter.h> #include <container/seadSafeArray.h> #include <prim/seadEnum.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> +#include <utility/aglResParameter.h> #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 a2f99461..c72e72ce 100644 --- a/src/KingSystem/Quest/qstManager.h +++ b/src/KingSystem/Quest/qstManager.h @@ -3,9 +3,9 @@ #include <container/seadObjArray.h> #include <heap/seadDisposer.h> #include <prim/seadSafeString.h> +#include <utility/aglParameter.h> #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 667b6216..dffa196f 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 <utility/aglParameter.h> namespace ksys::qst { diff --git a/src/KingSystem/Resource/Actor/resResourceAIProgram.cpp b/src/KingSystem/Resource/Actor/resResourceAIProgram.cpp index b221f1e3..bbe70ba1 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 <agl/utl/aglParameter.h> #include <heap/seadHeapMgr.h> +#include <utility/aglParameter.h> #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 29c3d17e..e9d89f9f 100644 --- a/src/KingSystem/Resource/Actor/resResourceAIProgram.h +++ b/src/KingSystem/Resource/Actor/resResourceAIProgram.h @@ -1,10 +1,10 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> #include <math/seadVector.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> #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 531ca944..ffcfaa3c 100644 --- a/src/KingSystem/Resource/Actor/resResourceAS.h +++ b/src/KingSystem/Resource/Actor/resResourceAS.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> #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 5526577c..0963075f 100644 --- a/src/KingSystem/Resource/Actor/resResourceASList.h +++ b/src/KingSystem/Resource/Actor/resResourceASList.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> #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 82597906..4b07bde6 100644 --- a/src/KingSystem/Resource/Actor/resResourceASResource.h +++ b/src/KingSystem/Resource/Actor/resResourceASResource.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglResParameter.h> #include <container/seadBuffer.h> #include <prim/seadRuntimeTypeInfo.h> +#include <utility/aglParameterList.h> +#include <utility/aglResParameter.h> #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 4b39e2c4..b88c6c62 100644 --- a/src/KingSystem/Resource/Actor/resResourceASResourceExtension.h +++ b/src/KingSystem/Resource/Actor/resResourceASResourceExtension.h @@ -1,13 +1,13 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> -#include <agl/utl/aglResParameter.h> #include <array> #include <basis/seadTypes.h> #include <container/seadBuffer.h> #include <prim/seadRuntimeTypeInfo.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> +#include <utility/aglResParameter.h> #include "KingSystem/Utils/Types.h" namespace sead { diff --git a/src/KingSystem/Resource/Actor/resResourceActorCapture.h b/src/KingSystem/Resource/Actor/resResourceActorCapture.h index 08cdd8e7..eda2e6a2 100644 --- a/src/KingSystem/Resource/Actor/resResourceActorCapture.h +++ b/src/KingSystem/Resource/Actor/resResourceActorCapture.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> #include <math/seadVector.h> #include <prim/seadSafeString.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #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 7f13adc0..fb6e2251 100644 --- a/src/KingSystem/Resource/Actor/resResourceActorLink.h +++ b/src/KingSystem/Resource/Actor/resResourceActorLink.h @@ -1,8 +1,8 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #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 92b5b332..ec78be6e 100644 --- a/src/KingSystem/Resource/Actor/resResourceAttCheck.h +++ b/src/KingSystem/Resource/Actor/resResourceAttCheck.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <prim/seadRuntimeTypeInfo.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> #include "resResourceAttClient.h" #include "resResourceAttPos.h" diff --git a/src/KingSystem/Resource/Actor/resResourceAttClient.h b/src/KingSystem/Resource/Actor/resResourceAttClient.h index 68ab66ff..a9e5858c 100644 --- a/src/KingSystem/Resource/Actor/resResourceAttClient.h +++ b/src/KingSystem/Resource/Actor/resResourceAttClient.h @@ -1,10 +1,10 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> #include <prim/seadSafeString.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> #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 ddb8bf00..b2c438a6 100644 --- a/src/KingSystem/Resource/Actor/resResourceAttPos.h +++ b/src/KingSystem/Resource/Actor/resResourceAttPos.h @@ -1,7 +1,7 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #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 8abf3f30..d7ddc591 100644 --- a/src/KingSystem/Resource/Actor/resResourceAwareness.h +++ b/src/KingSystem/Resource/Actor/resResourceAwareness.h @@ -1,7 +1,7 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #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 9e2cd211..0a99a279 100644 --- a/src/KingSystem/Resource/Actor/resResourceBoneControl.h +++ b/src/KingSystem/Resource/Actor/resResourceBoneControl.h @@ -1,11 +1,11 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> #include <math/seadVector.h> #include <prim/seadSafeString.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> #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 db4d93eb..4ea19e00 100644 --- a/src/KingSystem/Resource/Actor/resResourceDamageParam.h +++ b/src/KingSystem/Resource/Actor/resResourceDamageParam.h @@ -1,7 +1,7 @@ -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> #include <prim/seadEnum.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #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 267a239c..dcb378f9 100644 --- a/src/KingSystem/Resource/Actor/resResourceDrop.h +++ b/src/KingSystem/Resource/Actor/resResourceDrop.h @@ -1,8 +1,8 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #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 4bd2ad5d..a7e68de3 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 <agl/utl/aglParameter.h> #include <prim/seadRuntimeTypeInfo.h> +#include <utility/aglParameter.h> #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 7b69f6c9..00ec3c59 100644 --- a/src/KingSystem/Resource/Actor/resResourceLifeCondition.h +++ b/src/KingSystem/Resource/Actor/resResourceLifeCondition.h @@ -1,8 +1,8 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #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 932798d3..8c6ece1e 100644 --- a/src/KingSystem/Resource/Actor/resResourceLod.h +++ b/src/KingSystem/Resource/Actor/resResourceLod.h @@ -1,8 +1,8 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterObj.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterObj.h> #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 298af40f..8c79e836 100644 --- a/src/KingSystem/Resource/Actor/resResourceModelList.h +++ b/src/KingSystem/Resource/Actor/resResourceModelList.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> #include <prim/seadSafeString.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #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 02cb846b..21735ef4 100644 --- a/src/KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h +++ b/src/KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> #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 6c4cb5d7..3414278d 100644 --- a/src/KingSystem/Resource/Actor/resResourceRagdollConfigList.h +++ b/src/KingSystem/Resource/Actor/resResourceRagdollConfigList.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> #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 175d2d26..1c148a57 100644 --- a/src/KingSystem/Resource/Actor/resResourceRecipe.h +++ b/src/KingSystem/Resource/Actor/resResourceRecipe.h @@ -1,8 +1,8 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #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 97fcfde9..777a3c49 100644 --- a/src/KingSystem/Resource/Actor/resResourceShop.h +++ b/src/KingSystem/Resource/Actor/resResourceShop.h @@ -1,8 +1,8 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #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 9f023f6f..d9756490 100644 --- a/src/KingSystem/Resource/Actor/resResourceUMii.h +++ b/src/KingSystem/Resource/Actor/resResourceUMii.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglResParameter.h> +#include <utility/aglResParameter.h> #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 b9d89b84..9575e430 100644 --- a/src/KingSystem/Resource/Event/resResourceDemo.h +++ b/src/KingSystem/Resource/Event/resResourceDemo.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterObj.h> #include <resource/seadResource.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterObj.h> #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 4ad46e45..640a2cc8 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObject.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObject.h @@ -1,7 +1,7 @@ #pragma once -#include <agl/utl/aglParameterObj.h> #include <hostio/seadHostIONode.h> +#include <utility/aglParameterObj.h> #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 b2f7a224..644da740 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAirWall.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAirWall.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 26ae8c14..077cf539 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalFollowOffset.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalFollowOffset.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 2a707244..69bfbcf6 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalUnit.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalUnit.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 9029a02b..f388f91d 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 c53b01bc..8da2e612 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 6a5a8355..eb028f7f 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorHead.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorHead.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 01579bb5..c7d52dd7 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorUpper.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorUpper.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 0bc0d6de..cbc7bc27 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArrow.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectArrow.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 61764e38..203b1e70 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 5098c717..a5b94665 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 eb50bc52..8f693c37 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAutoGen.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectAutoGen.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 fae695b4..0dab8fc3 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBeam.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBeam.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 6b93c7bf..1b23532b 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 cfd70118..08b61e08 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 4e6de79b..66ef8863 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 133dfc9c..05ea8225 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBullet.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectBullet.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 d61b475a..e358865a 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCamera.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCamera.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 b865c509..c0a3484b 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectChemicalType.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectChemicalType.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 01f2ab78..8b5e402c 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectClothReaction.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectClothReaction.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 3e4c1618..9b1d1836 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCookSpice.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCookSpice.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 14b97e61..c15d117c 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCureItem.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectCureItem.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 71fe8e1d..2dc5a410 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEatTarget.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEatTarget.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 9ab0882f..63cecb4c 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 dfa1147f..238378bb 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 02a046da..6cfa562d 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 a72c6b91..aa786d9f 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 9c8039b0..46a98dc8 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEvent.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectEvent.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 011855ae..f846bd02 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectExtendedEntity.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 5712a38e..7197d34b 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectFish.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectFish.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 227c5fcd..91b4b292 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGelEnemy.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGelEnemy.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 d59faa7d..abde1b00 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGeneral.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 a0298b8f..0a7e40e3 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmor.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 cb35cba2..02578ed5 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmorSlot.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGiantArmorSlot.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 857442ad..c20c8a69 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGlobal.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGlobal.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 33ccbc23..96316f97 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolem.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolem.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 27235cac..ca4c040f 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolemIK.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGolemIK.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 3b34bfda..f748cf3d 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGrab.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 c3cc54b6..c36b9dc0 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardian.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardian.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 39043a39..41c3d02f 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMini.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMini.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 f7cd4d7a..17b711b8 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectGuardianMiniWeapon.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 7bedd55b..adcd565f 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorse.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorse.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 f3e136cb..107e9867 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseCreator.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseCreator.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 38464832..20acdef3 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseObject.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseObject.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 40a84957..3edcd0d8 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseRider.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseRider.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 2180db16..ad68f7df 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseTargetedInfo.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseTargetedInfo.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 df4761b3..c297a113 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseUnit.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectHorseUnit.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 b741f7b4..8b52193f 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectInsect.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectInsect.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 52a2d4c7..9e9002c7 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectItem.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectItem.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 012f138e..d275aad7 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLargeSword.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 7b3c3eb8..ff05fd3d 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLiftable.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 cc715083..62be2f41 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectLumberjackTree.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 6d512afa..2261dfd6 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMasterSword.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 1140a5c5..4ca5fba0 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMonsterShop.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMonsterShop.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 dcb1b8de..3381c3cb 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMotorcycle.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectMotorcycle.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 b0276842..623081f7 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNest.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNest.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 a758b735..37de85ad 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpc.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpc.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 df8026f3..cc4db37d 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpcEquipment.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectNpcEquipment.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 61193cf1..d8eb4e15 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPictureBook.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPictureBook.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 a4b788d8..e5f22a7b 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPlayer.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 41602682..bcbe5ce3 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPrey.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectPrey.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 dbc92009..bfa3a9d9 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRod.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 e52859c3..0a713503 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRope.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRope.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 16544e60..a360bc51 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRupee.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectRupee.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 0dc2d61f..54cc0293 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSandworm.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 49a6dd83..0a94e60b 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSeriesArmor.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 6495ad83..4ed85db5 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShiekerStone.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 ea7d2ef5..3e2de264 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectShield.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 bfb774d7..99f65da0 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSmallSword.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 7c4577da..64374121 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSpear.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 85887c48..6bb71c75 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectStalEnemy.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectStalEnemy.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 eaf2824f..d8107dd5 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSwarm.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSwarm.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 c19e96a1..add5450a 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectSystem.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 372a3600..5af115cf 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 575d01ff..cdf72901 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponCommon.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 553750f2..9789ebf1 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponOption.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 c20ca67c..8be4b2c8 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponThrow.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWeaponThrow.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 1a58bcd6..4fd0986e 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWizzrobe.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWizzrobe.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 0098706c..950b7a8e 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWolfLink.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectWolfLink.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 31cd02bd..98858244 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectZora.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectZora.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameter.h> +#include <utility/aglParameter.h> #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 6f4a3f12..c9462199 100644 --- a/src/KingSystem/Resource/resResourceASSetting.h +++ b/src/KingSystem/Resource/resResourceASSetting.h @@ -1,14 +1,14 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> -#include <agl/utl/aglResParameter.h> #include <basis/seadTypes.h> #include <container/seadBuffer.h> #include <prim/seadRuntimeTypeInfo.h> #include <prim/seadSafeString.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> +#include <utility/aglResParameter.h> #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 acfd216c..d5275aa5 100644 --- a/src/KingSystem/Sound/sndMusicDefinition.h +++ b/src/KingSystem/Sound/sndMusicDefinition.h @@ -1,11 +1,11 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> #include <resource/seadResource.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> #include "KingSystem/Utils/Types.h" namespace ksys::snd { diff --git a/src/KingSystem/Sound/sndMusicInfo.h b/src/KingSystem/Sound/sndMusicInfo.h index 86062bd6..4447a767 100644 --- a/src/KingSystem/Sound/sndMusicInfo.h +++ b/src/KingSystem/Sound/sndMusicInfo.h @@ -1,13 +1,13 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterList.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> #include <prim/seadEnum.h> #include <prim/seadSafeString.h> #include <resource/seadResource.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterList.h> +#include <utility/aglParameterObj.h> #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/System/VideoRecorder.h b/src/KingSystem/System/VideoRecorder.h index 79ab300f..bdd06f2e 100644 --- a/src/KingSystem/System/VideoRecorder.h +++ b/src/KingSystem/System/VideoRecorder.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglScreenShotMgr.h> #include <basis/seadNew.h> #include <heap/seadDisposer.h> #include <prim/seadSafeString.h> +#include <utility/aglScreenShotMgr.h> #include "KingSystem/Utils/Types.h" namespace ksys { @@ -28,4 +28,4 @@ private: 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 d98d4d94..2a95c118 100644 --- a/src/KingSystem/Utils/ParamIO.cpp +++ b/src/KingSystem/Utils/ParamIO.cpp @@ -1,6 +1,6 @@ #include "KingSystem/Utils/ParamIO.h" -#include <agl/utl/aglParameter.h> #include <cstring> +#include <utility/aglParameter.h> #include "KingSystem/ActorSystem/actActorParamMgr.h" namespace ksys { diff --git a/src/KingSystem/Utils/ParamIO.h b/src/KingSystem/Utils/ParamIO.h index 7ffb43a0..02ff3546 100644 --- a/src/KingSystem/Utils/ParamIO.h +++ b/src/KingSystem/Utils/ParamIO.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameterIO.h> #include <hostio/seadHostIONode.h> #include <math/seadVector.h> #include <prim/seadSafeString.h> +#include <utility/aglParameterIO.h> #include "KingSystem/Utils/Types.h" namespace ksys { diff --git a/src/KingSystem/World/worldDofMgr.h b/src/KingSystem/World/worldDofMgr.h index 4c6f447a..ce5d38a9 100644 --- a/src/KingSystem/World/worldDofMgr.h +++ b/src/KingSystem/World/worldDofMgr.h @@ -1,6 +1,6 @@ #pragma once -#include <agl/utl/aglParameterObj.h> +#include <utility/aglParameterObj.h> #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 390cd857..397ec423 100644 --- a/src/KingSystem/World/worldEnvMgr.h +++ b/src/KingSystem/World/worldEnvMgr.h @@ -1,10 +1,10 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadSafeArray.h> #include <gfx/seadColor.h> #include <prim/seadStorageFor.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #include "KingSystem/Utils/Types.h" #include "KingSystem/World/worldJob.h" diff --git a/src/KingSystem/World/worldManager.h b/src/KingSystem/World/worldManager.h index 4f35fd42..159ebd8d 100644 --- a/src/KingSystem/World/worldManager.h +++ b/src/KingSystem/World/worldManager.h @@ -1,15 +1,15 @@ #pragma once -#include <agl/utl/aglAtomicPtrArray.h> -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterIO.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadBuffer.h> #include <container/seadPtrArray.h> #include <container/seadSafeArray.h> #include <hostio/seadHostIONode.h> #include <mc/seadJobQueue.h> #include <prim/seadSizedEnum.h> +#include <utility/aglAtomicPtrArray.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterIO.h> +#include <utility/aglParameterObj.h> #include "KingSystem/Resource/resHandle.h" #include "KingSystem/System/StageInfo.h" #include "KingSystem/Utils/Types.h" diff --git a/src/KingSystem/World/worldSkyMgr.h b/src/KingSystem/World/worldSkyMgr.h index 8d43be2b..534d87d0 100644 --- a/src/KingSystem/World/worldSkyMgr.h +++ b/src/KingSystem/World/worldSkyMgr.h @@ -1,9 +1,9 @@ #pragma once -#include <agl/utl/aglParameter.h> -#include <agl/utl/aglParameterObj.h> #include <container/seadSafeArray.h> #include <math/seadVector.h> +#include <utility/aglParameter.h> +#include <utility/aglParameterObj.h> #include "KingSystem/Utils/Types.h" #include "KingSystem/World/worldJob.h" |