From aae96333b1b2d83b4f26444b4f990a9d415ad413 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sun, 2 Feb 2020 12:23:50 +0100 Subject: [PATCH] Reorganized files --- CMakeLists.txt | 4 ++-- .../AngelScript/AngelScripResolver.cpp | 6 +++--- .../AngelScript/AngelScripResolver.hpp | 2 +- src/{ => ScriptResolving}/AngelScript/AngelScriptScript.cpp | 0 src/{ => ScriptResolving}/AngelScript/AngelScriptScript.hpp | 0 .../AngelScript/AngelScriptTypeInfo.cpp | 0 .../AngelScript/AngelScriptTypeInfo.hpp | 0 src/{ => ScriptResolving}/AngelScript/ContextPool.cpp | 0 src/{ => ScriptResolving}/AngelScript/ContextPool.hpp | 0 .../TypeRegistry/Battling/RegisterBattleLibrary.cpp | 2 +- .../TypeRegistry/Battling/RegisterBattleLibrary.hpp | 0 .../TypeRegistry/Battling/RegisterExecutingAttack.cpp | 0 .../TypeRegistry/Battling/RegisterExecutingAttack.hpp | 0 .../TypeRegistry/Battling/RegisterPokemonClass.cpp | 4 ++-- .../TypeRegistry/Battling/RegisterPokemonClass.hpp | 0 .../TypeRegistry/Library/RegisterGrowthRateTypes.cpp | 0 .../TypeRegistry/Library/RegisterGrowthRateTypes.hpp | 0 .../AngelScript/TypeRegistry/Library/RegisterItemTypes.cpp | 4 ++-- .../AngelScript/TypeRegistry/Library/RegisterItemTypes.hpp | 0 .../AngelScript/TypeRegistry/Library/RegisterMoveTypes.cpp | 4 ++-- .../AngelScript/TypeRegistry/Library/RegisterMoveTypes.hpp | 0 .../TypeRegistry/Library/RegisterSpeciesTypes.cpp | 6 +++--- .../TypeRegistry/Library/RegisterSpeciesTypes.hpp | 0 .../TypeRegistry/Library/RegisterStaticLibraryTypes.cpp | 2 +- .../TypeRegistry/Library/RegisterStaticLibraryTypes.hpp | 0 .../TypeRegistry/Library/RegisterTypeLibrary.cpp | 0 .../TypeRegistry/Library/RegisterTypeLibrary.hpp | 0 tests/ScriptTests/ScriptResolverTests.cpp | 2 +- tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp | 2 +- tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp | 2 +- tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp | 2 +- tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp | 2 +- tests/ScriptTests/ScriptTypeTests/Library/SpeciesTests.cpp | 2 +- .../ScriptTypeTests/Library/StaticLibraryTests.cpp | 2 +- 34 files changed, 24 insertions(+), 24 deletions(-) rename src/{ => ScriptResolving}/AngelScript/AngelScripResolver.cpp (94%) rename src/{ => ScriptResolving}/AngelScript/AngelScripResolver.hpp (96%) rename src/{ => ScriptResolving}/AngelScript/AngelScriptScript.cpp (100%) rename src/{ => ScriptResolving}/AngelScript/AngelScriptScript.hpp (100%) rename src/{ => ScriptResolving}/AngelScript/AngelScriptTypeInfo.cpp (100%) rename src/{ => ScriptResolving}/AngelScript/AngelScriptTypeInfo.hpp (100%) rename src/{ => ScriptResolving}/AngelScript/ContextPool.cpp (100%) rename src/{ => ScriptResolving}/AngelScript/ContextPool.hpp (100%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Battling/RegisterBattleLibrary.cpp (90%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Battling/RegisterBattleLibrary.hpp (100%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp (100%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.hpp (100%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp (98%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.hpp (100%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.cpp (100%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.hpp (100%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Library/RegisterItemTypes.cpp (97%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Library/RegisterItemTypes.hpp (100%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Library/RegisterMoveTypes.cpp (97%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Library/RegisterMoveTypes.hpp (100%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Library/RegisterSpeciesTypes.cpp (97%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Library/RegisterSpeciesTypes.hpp (100%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Library/RegisterStaticLibraryTypes.cpp (98%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Library/RegisterStaticLibraryTypes.hpp (100%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.cpp (100%) rename src/{ => ScriptResolving}/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff44052..255658d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,8 +60,8 @@ SET(FILE_SOURCE ) if (SCRIPT_PROVIDER STREQUAL "angelscript") SET(FILE_SOURCE ${FILE_SOURCE} - "src/AngelScript/*.cpp" - "src/AngelScript/*.hpp" + "src/ScriptResolving/AngelScript/*.cpp" + "src/ScriptResolving/AngelScript/*.hpp" "extern/angelscript_addons/*.cpp" "extern/angelscript_addons/*.h" ) diff --git a/src/AngelScript/AngelScripResolver.cpp b/src/ScriptResolving/AngelScript/AngelScripResolver.cpp similarity index 94% rename from src/AngelScript/AngelScripResolver.cpp rename to src/ScriptResolving/AngelScript/AngelScripResolver.cpp index 740298d..5a4f9b1 100644 --- a/src/AngelScript/AngelScripResolver.cpp +++ b/src/ScriptResolving/AngelScript/AngelScripResolver.cpp @@ -1,9 +1,9 @@ #include "AngelScripResolver.hpp" #define AS_USE_ACCESSORS -#include "../../extern/angelscript_addons/scriptarray/scriptarray.h" +#include "../../../extern/angelscript_addons/scriptarray/scriptarray.h" #undef AS_USE_ACCESSORS -#include "../../extern/angelscript_addons/scripthelper/scripthelper.h" -#include "../../extern/angelscript_addons/scriptstdstring/scriptstdstring.h" +#include "../../../extern/angelscript_addons/scripthelper/scripthelper.h" +#include "../../../extern/angelscript_addons/scriptstdstring/scriptstdstring.h" #include "TypeRegistry/Battling/RegisterExecutingAttack.hpp" #include "TypeRegistry/Battling/RegisterPokemonClass.hpp" #include "TypeRegistry/Library/RegisterGrowthRateTypes.hpp" diff --git a/src/AngelScript/AngelScripResolver.hpp b/src/ScriptResolving/AngelScript/AngelScripResolver.hpp similarity index 96% rename from src/AngelScript/AngelScripResolver.hpp rename to src/ScriptResolving/AngelScript/AngelScripResolver.hpp index a4b7fcf..c55a707 100644 --- a/src/AngelScript/AngelScripResolver.hpp +++ b/src/ScriptResolving/AngelScript/AngelScripResolver.hpp @@ -2,7 +2,7 @@ #define PKMNLIB_ANGELSCRIPRESOLVER_HPP #include -#include "../Battling/Library/BattleLibrary.hpp" +#include "../../Battling/Library/BattleLibrary.hpp" #define ANGELSCRIPT_DLL_LIBRARY_IMPORT #include diff --git a/src/AngelScript/AngelScriptScript.cpp b/src/ScriptResolving/AngelScript/AngelScriptScript.cpp similarity index 100% rename from src/AngelScript/AngelScriptScript.cpp rename to src/ScriptResolving/AngelScript/AngelScriptScript.cpp diff --git a/src/AngelScript/AngelScriptScript.hpp b/src/ScriptResolving/AngelScript/AngelScriptScript.hpp similarity index 100% rename from src/AngelScript/AngelScriptScript.hpp rename to src/ScriptResolving/AngelScript/AngelScriptScript.hpp diff --git a/src/AngelScript/AngelScriptTypeInfo.cpp b/src/ScriptResolving/AngelScript/AngelScriptTypeInfo.cpp similarity index 100% rename from src/AngelScript/AngelScriptTypeInfo.cpp rename to src/ScriptResolving/AngelScript/AngelScriptTypeInfo.cpp diff --git a/src/AngelScript/AngelScriptTypeInfo.hpp b/src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp similarity index 100% rename from src/AngelScript/AngelScriptTypeInfo.hpp rename to src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp diff --git a/src/AngelScript/ContextPool.cpp b/src/ScriptResolving/AngelScript/ContextPool.cpp similarity index 100% rename from src/AngelScript/ContextPool.cpp rename to src/ScriptResolving/AngelScript/ContextPool.cpp diff --git a/src/AngelScript/ContextPool.hpp b/src/ScriptResolving/AngelScript/ContextPool.hpp similarity index 100% rename from src/AngelScript/ContextPool.hpp rename to src/ScriptResolving/AngelScript/ContextPool.hpp diff --git a/src/AngelScript/TypeRegistry/Battling/RegisterBattleLibrary.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterBattleLibrary.cpp similarity index 90% rename from src/AngelScript/TypeRegistry/Battling/RegisterBattleLibrary.cpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterBattleLibrary.cpp index 4487a37..e08bef7 100644 --- a/src/AngelScript/TypeRegistry/Battling/RegisterBattleLibrary.cpp +++ b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterBattleLibrary.cpp @@ -1,6 +1,6 @@ #include "RegisterBattleLibrary.hpp" #include -#include "../../../Battling/Library/DamageLibrary.hpp" +#include "../../../../Battling/Library/DamageLibrary.hpp" void RegisterBattleLibrary::Register(asIScriptEngine* engine) { RegisterDamageLibrary(engine); diff --git a/src/AngelScript/TypeRegistry/Battling/RegisterBattleLibrary.hpp b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterBattleLibrary.hpp similarity index 100% rename from src/AngelScript/TypeRegistry/Battling/RegisterBattleLibrary.hpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterBattleLibrary.hpp diff --git a/src/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp similarity index 100% rename from src/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp diff --git a/src/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.hpp b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.hpp similarity index 100% rename from src/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.hpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.hpp diff --git a/src/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp similarity index 98% rename from src/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp index 362ee44..21f9c4c 100644 --- a/src/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp +++ b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp @@ -1,8 +1,8 @@ #include "RegisterPokemonClass.hpp" #include #include -#include "../../../../extern/angelscript_addons/scriptarray/scriptarray.h" -#include "../../../Battling/Pokemon/Pokemon.hpp" +#include "../../../../../extern/angelscript_addons/scriptarray/scriptarray.h" +#include "../../../../Battling/Pokemon/Pokemon.hpp" // Hack to handle AngelScript not recognizing different sized enums on fields, and returning invalid values due to it. #define ENUM__SIZE_WRAPPER(name, type, func) \ diff --git a/src/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.hpp b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.hpp similarity index 100% rename from src/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.hpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.hpp diff --git a/src/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.cpp similarity index 100% rename from src/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.cpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.cpp diff --git a/src/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.hpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.hpp similarity index 100% rename from src/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.hpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.hpp diff --git a/src/AngelScript/TypeRegistry/Library/RegisterItemTypes.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterItemTypes.cpp similarity index 97% rename from src/AngelScript/TypeRegistry/Library/RegisterItemTypes.cpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterItemTypes.cpp index fb4b608..5b82a16 100644 --- a/src/AngelScript/TypeRegistry/Library/RegisterItemTypes.cpp +++ b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterItemTypes.cpp @@ -1,7 +1,7 @@ #include "RegisterItemTypes.hpp" #include -#include "../../../Library/Items/Item.hpp" -#include "../../../Library/Items/ItemLibrary.hpp" +#include "../../../../Library/Items/Item.hpp" +#include "../../../../Library/Items/ItemLibrary.hpp" void RegisterItemTypes::Register(asIScriptEngine* engine) { RegisterItemCategoryEnum(engine); diff --git a/src/AngelScript/TypeRegistry/Library/RegisterItemTypes.hpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterItemTypes.hpp similarity index 100% rename from src/AngelScript/TypeRegistry/Library/RegisterItemTypes.hpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterItemTypes.hpp diff --git a/src/AngelScript/TypeRegistry/Library/RegisterMoveTypes.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterMoveTypes.cpp similarity index 97% rename from src/AngelScript/TypeRegistry/Library/RegisterMoveTypes.cpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterMoveTypes.cpp index 067a783..23459a7 100644 --- a/src/AngelScript/TypeRegistry/Library/RegisterMoveTypes.cpp +++ b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterMoveTypes.cpp @@ -1,7 +1,7 @@ #include "RegisterMoveTypes.hpp" #include -#include "../../../Library/Moves/MoveData.hpp" -#include "../../../Library/Moves/MoveLibrary.hpp" +#include "../../../../Library/Moves/MoveData.hpp" +#include "../../../../Library/Moves/MoveLibrary.hpp" void RegisterMoveTypes::Register(asIScriptEngine* engine) { RegisterMoveCategory(engine); diff --git a/src/AngelScript/TypeRegistry/Library/RegisterMoveTypes.hpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterMoveTypes.hpp similarity index 100% rename from src/AngelScript/TypeRegistry/Library/RegisterMoveTypes.hpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterMoveTypes.hpp diff --git a/src/AngelScript/TypeRegistry/Library/RegisterSpeciesTypes.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterSpeciesTypes.cpp similarity index 97% rename from src/AngelScript/TypeRegistry/Library/RegisterSpeciesTypes.cpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterSpeciesTypes.cpp index ed22176..83769b3 100644 --- a/src/AngelScript/TypeRegistry/Library/RegisterSpeciesTypes.cpp +++ b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterSpeciesTypes.cpp @@ -1,8 +1,8 @@ #include "RegisterSpeciesTypes.hpp" #include -#include "../../../Library/Species/PokemonSpecies.hpp" -#include "../../../Library/Species/SpeciesLibrary.hpp" -#include "../../../Library/Statistic.hpp" +#include "../../../../Library/Species/PokemonSpecies.hpp" +#include "../../../../Library/Species/SpeciesLibrary.hpp" +#include "../../../../Library/Statistic.hpp" void RegisterSpeciesTypes::Register(asIScriptEngine* engine) { RegisterGenderEnum(engine); diff --git a/src/AngelScript/TypeRegistry/Library/RegisterSpeciesTypes.hpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterSpeciesTypes.hpp similarity index 100% rename from src/AngelScript/TypeRegistry/Library/RegisterSpeciesTypes.hpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterSpeciesTypes.hpp diff --git a/src/AngelScript/TypeRegistry/Library/RegisterStaticLibraryTypes.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterStaticLibraryTypes.cpp similarity index 98% rename from src/AngelScript/TypeRegistry/Library/RegisterStaticLibraryTypes.cpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterStaticLibraryTypes.cpp index 1cb8ea8..6ce9415 100644 --- a/src/AngelScript/TypeRegistry/Library/RegisterStaticLibraryTypes.cpp +++ b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterStaticLibraryTypes.cpp @@ -1,6 +1,6 @@ #include "RegisterStaticLibraryTypes.hpp" #include -#include "../../../Library/PokemonLibrary.hpp" +#include "../../../../Library/PokemonLibrary.hpp" void RegisterStaticLibraryTypes::Register(asIScriptEngine* engine) { RegisterLibrarySettingsType(engine); diff --git a/src/AngelScript/TypeRegistry/Library/RegisterStaticLibraryTypes.hpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterStaticLibraryTypes.hpp similarity index 100% rename from src/AngelScript/TypeRegistry/Library/RegisterStaticLibraryTypes.hpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterStaticLibraryTypes.hpp diff --git a/src/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.cpp similarity index 100% rename from src/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.cpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.cpp diff --git a/src/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.hpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.hpp similarity index 100% rename from src/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.hpp rename to src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.hpp diff --git a/tests/ScriptTests/ScriptResolverTests.cpp b/tests/ScriptTests/ScriptResolverTests.cpp index fc49c20..3e5dce6 100644 --- a/tests/ScriptTests/ScriptResolverTests.cpp +++ b/tests/ScriptTests/ScriptResolverTests.cpp @@ -1,6 +1,6 @@ #ifdef TESTS_BUILD #include "../../extern/catch.hpp" -#include "../../src/AngelScript/AngelScripResolver.hpp" +#include "../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp" #include "../TestLibrary/TestLibrary.hpp" static std::unordered_map _scripts = diff --git a/tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp b/tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp index da0dbea..71b44e6 100644 --- a/tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp +++ b/tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp @@ -1,6 +1,6 @@ #ifdef TESTS_BUILD #include "../../../../extern/catch.hpp" -#include "../../../../src/AngelScript/AngelScripResolver.hpp" +#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp" #include "../../../../src/Battling/Pokemon/CreatePokemon.hpp" #include "../../../TestLibrary/TestLibrary.hpp" diff --git a/tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp b/tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp index a3560ce..f28b014 100644 --- a/tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp +++ b/tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp @@ -1,6 +1,6 @@ #ifdef TESTS_BUILD #include "../../../../extern/catch.hpp" -#include "../../../../src/AngelScript/AngelScripResolver.hpp" +#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp" #include "../../../TestLibrary/TestLibrary.hpp" static std::unordered_map _scripts = diff --git a/tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp b/tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp index 562668d..9de530a 100644 --- a/tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp +++ b/tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp @@ -1,6 +1,6 @@ #ifdef TESTS_BUILD #include "../../../../extern/catch.hpp" -#include "../../../../src/AngelScript/AngelScripResolver.hpp" +#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp" #include "../../../TestLibrary/TestLibrary.hpp" static std::unordered_map _scripts = diff --git a/tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp b/tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp index d3fae1b..73b1b18 100644 --- a/tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp +++ b/tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp @@ -1,6 +1,6 @@ #ifdef TESTS_BUILD #include "../../../../extern/catch.hpp" -#include "../../../../src/AngelScript/AngelScripResolver.hpp" +#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp" #include "../../../TestLibrary/TestLibrary.hpp" static std::unordered_map _scripts = diff --git a/tests/ScriptTests/ScriptTypeTests/Library/SpeciesTests.cpp b/tests/ScriptTests/ScriptTypeTests/Library/SpeciesTests.cpp index 2fcf859..30798f9 100644 --- a/tests/ScriptTests/ScriptTypeTests/Library/SpeciesTests.cpp +++ b/tests/ScriptTests/ScriptTypeTests/Library/SpeciesTests.cpp @@ -1,6 +1,6 @@ #ifdef TESTS_BUILD #include "../../../../extern/catch.hpp" -#include "../../../../src/AngelScript/AngelScripResolver.hpp" +#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp" #include "../../../TestLibrary/TestLibrary.hpp" static std::unordered_map _scripts = diff --git a/tests/ScriptTests/ScriptTypeTests/Library/StaticLibraryTests.cpp b/tests/ScriptTests/ScriptTypeTests/Library/StaticLibraryTests.cpp index 83e8895..2496b6e 100644 --- a/tests/ScriptTests/ScriptTypeTests/Library/StaticLibraryTests.cpp +++ b/tests/ScriptTests/ScriptTypeTests/Library/StaticLibraryTests.cpp @@ -1,6 +1,6 @@ #ifdef TESTS_BUILD #include "../../../../extern/catch.hpp" -#include "../../../../src/AngelScript/AngelScripResolver.hpp" +#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp" #include "../../../TestLibrary/TestLibrary.hpp" static std::unordered_map _scripts =