small fix

pointcache · Jul 12, 2017 · 18a55c5 · 18a55c5
1 parent c1dd626
commit 18a55c5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.vs/URSA/v15/TabsStudio.tss b/.vs/URSA/v15/TabsStudio.tss
@@ -10,6 +10,9 @@
     <ArrayOfString>
       <string>d:\work\ursa\assets\ursa\serialization\blueprint\blueprintloader.cs</string>
     </ArrayOfString>
+    <ArrayOfString>
+      <string>D:\Work\URSA\Assets\URSA\Collisions\CollisionHub.cs</string>
+    </ArrayOfString>
     <ArrayOfString>
       <string>d:\work\ursa\assets\ursa\componentbase.cs</string>
     </ArrayOfString>
@@ -65,10 +68,10 @@
       <string>D:\Work\URSA\Assets\Example\TestConfig.cs</string>
     </ArrayOfString>
     <ArrayOfString>
-      <string>D:\Work\URSA\Assets\URSA\Utility\Editor\URSAEditorTools.cs</string>
+      <string>d:\work\ursa\assets\ursa\utility\editor\ursaeditortools.cs</string>
     </ArrayOfString>
     <ArrayOfString>
-      <string>D:\Work\URSA\Assets\URSA\Internal\URSASettings.cs</string>
+      <string>d:\work\ursa\assets\ursa\internal\ursasettings.cs</string>
     </ArrayOfString>
   </ArrayOfArrayOfString>
 </ArrayOfArrayOfArrayOfString>
diff --git a/Assets/URSA/ECSController.cs b/Assets/URSA/ECSController.cs
@@ -47,7 +47,7 @@ public static ECSController instance
         /// <summary>
         /// Deserialize your initial player profiles, etc
         /// </summary>
-        public static event Action OnInitialLoadPersistentData = delegate { };
+        public static event Action OnLoadGlobalData = delegate { };
 
         public static event Action OnGlobalSystemsFullyInitialized = delegate { };
         /// <summary>
@@ -121,6 +121,7 @@ private void GlobalInitialization() {
             if (Configs)
                 Configs.SetActive(true);
             gameObject.AddComponent<EntityDatabase>();
+            OnLoadGlobalData();
 
             foreach (Transform tr in transform) {
                 if (tr.gameObject == Configs)
@@ -133,11 +134,11 @@ private void GlobalInitialization() {
             }
 
 
-            OnInitialLoadPersistentData();
             if (Configurator != null)
                 Configurator.ConfigureGlobal();
             globalInitialized = true;
-            var GlobalExecutor = gameObject.AddComponent<GlobalSystemsExecutor>();
+
+            gameObject.AddComponent<GlobalSystemsExecutor>();
             OnGlobalSystemsFullyInitialized();
         }
 
@@ -163,5 +164,4 @@ private void LocalInitialization() {
             SystemsExecutor.UpdateAllowed = true;
         }
     }
-
 }