diff --git a/.gitignore b/.gitignore index 400a9aba..9be79d14 100644 --- a/.gitignore +++ b/.gitignore @@ -113,7 +113,7 @@ src/common/Version\.cpp .mtime_cache # generated script loader files -src/servers/sapphire_zone/Script/Scripts/*/ScriptLoader.cpp +src/servers/Scripts/*/ScriptLoader.cpp # cotire generated files/folders cotire/ diff --git a/src/servers/Scripts/action/ScriptLoader.cpp b/src/servers/sapphire_zone/Script/Scripts/action/ScriptLoader.cpp similarity index 100% rename from src/servers/Scripts/action/ScriptLoader.cpp rename to src/servers/sapphire_zone/Script/Scripts/action/ScriptLoader.cpp diff --git a/src/servers/Scripts/common/ScriptLoader.cpp b/src/servers/sapphire_zone/Script/Scripts/common/ScriptLoader.cpp similarity index 100% rename from src/servers/Scripts/common/ScriptLoader.cpp rename to src/servers/sapphire_zone/Script/Scripts/common/ScriptLoader.cpp index e4bc7a56..c1871bea 100644 --- a/src/servers/Scripts/common/ScriptLoader.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/common/ScriptLoader.cpp @@ -2,19 +2,19 @@ #include "Aethernet.cpp" #include "Aetheryte.cpp" -#include "HouFurOrchestrion.cpp" -#include "CmnDefInnBed.cpp" #include "CmnDefCutSceneReplay.cpp" +#include "CmnDefInnBed.cpp" #include "CmnDefLinkShell.cpp" +#include "HouFurOrchestrion.cpp" const ScriptObject* ptrs[] = { static_cast< ScriptObject* >( new Aethernet ), static_cast< ScriptObject* >( new Aetheryte ), - static_cast< ScriptObject* >( new HouFurOrchestrion ), - static_cast< ScriptObject* >( new CmnDefInnBed ), static_cast< ScriptObject* >( new CmnDefCutSceneReplay ), + static_cast< ScriptObject* >( new CmnDefInnBed ), static_cast< ScriptObject* >( new CmnDefLinkShell ), + static_cast< ScriptObject* >( new HouFurOrchestrion ), nullptr }; diff --git a/src/servers/Scripts/instances/ScriptLoader.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ScriptLoader.cpp similarity index 99% rename from src/servers/Scripts/instances/ScriptLoader.cpp rename to src/servers/sapphire_zone/Script/Scripts/instances/ScriptLoader.cpp index 2c0c33c0..ecb96b87 100644 --- a/src/servers/Scripts/instances/ScriptLoader.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/instances/ScriptLoader.cpp @@ -1,542 +1,542 @@ #include