Merge pull request #270 from NotAdam/actor_rewrite

remove scriptloader.cpp files from tree and ignore them, probably

.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/

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
 };

src/servers/sapphire_zone/Script/Scripts/opening/ScriptLoader.cpp

@@ -1,13 +1,13 @@
 #include <Script/NativeScriptApi.h>
 
-#include "OpeningLimsa.cpp"
 #include "OpeningGridania.cpp"
+#include "OpeningLimsa.cpp"
 #include "OpeningUldah.cpp"
 
 const ScriptObject* ptrs[] =
 {
-   static_cast< ScriptObject* >( new OpeningLimsa ),
    static_cast< ScriptObject* >( new OpeningGridania ),
+   static_cast< ScriptObject* >( new OpeningLimsa ),
    static_cast< ScriptObject* >( new OpeningUldah ),
 
    nullptr

src/servers/sapphire_zone/Script/Scripts/quest/ScriptLoader.cpp

@@ -1,32 +1,32 @@
 #include <Script/NativeScriptApi.h>
 
-#include "ManFst004.cpp"
-#include "ManSea002.cpp"
+#include "ManFst001.cpp"
 #include "ManFst002.cpp"
 #include "ManFst003.cpp"
+#include "ManFst004.cpp"
+#include "ManSea001.cpp"
+#include "ManSea002.cpp"
 #include "ManWil001.cpp"
 #include "ManWil002.cpp"
-#include "ManFst001.cpp"
-#include "subquest/gridania/SubFst002.cpp"
-#include "subquest/gridania/SubFst013.cpp"
 #include "subquest/gridania/SubFst001.cpp"
+#include "subquest/gridania/SubFst002.cpp"
 #include "subquest/gridania/SubFst010.cpp"
-#include "ManSea001.cpp"
+#include "subquest/gridania/SubFst013.cpp"
 
 const ScriptObject* ptrs[] =
 {
-   static_cast< ScriptObject* >( new ManFst004 ),
-   static_cast< ScriptObject* >( new ManSea002 ),
+   static_cast< ScriptObject* >( new ManFst001 ),
    static_cast< ScriptObject* >( new ManFst002 ),
    static_cast< ScriptObject* >( new ManFst003 ),
+   static_cast< ScriptObject* >( new ManFst004 ),
+   static_cast< ScriptObject* >( new ManSea001 ),
+   static_cast< ScriptObject* >( new ManSea002 ),
    static_cast< ScriptObject* >( new ManWil001 ),
    static_cast< ScriptObject* >( new ManWil002 ),
-   static_cast< ScriptObject* >( new ManFst001 ),
-   static_cast< ScriptObject* >( new SubFst002 ),
-   static_cast< ScriptObject* >( new SubFst013 ),
    static_cast< ScriptObject* >( new SubFst001 ),
+   static_cast< ScriptObject* >( new SubFst002 ),
    static_cast< ScriptObject* >( new SubFst010 ),
-   static_cast< ScriptObject* >( new ManSea001 ),
+   static_cast< ScriptObject* >( new SubFst013 ),
 
    nullptr
 };