v0.11.0.9

Barotrauma/BarotraumaClient/ClientSource/GameMain.cs

@@ -525,6 +525,7 @@ namespace Barotrauma
             Tutorials.Tutorial.Init();
             MapGenerationParams.Init();
             LevelGenerationParams.LoadPresets();
+            CaveGenerationParams.LoadPresets();
             OutpostGenerationParams.LoadPresets();
             WreckAIConfig.LoadAll();
             EventSet.LoadPrefabs();
@@ -533,6 +534,7 @@ namespace Barotrauma
             SkillSettings.Load(GetFilesOfType(ContentType.SkillSettings));
             Order.Init();
             EventManagerSettings.Init();
+            BallastFloraPrefab.LoadAll(GetFilesOfType(ContentType.MapCreature));
             TitleScreen.LoadState = 50.0f;
         yield return CoroutineStatus.Running;
 
@@ -632,6 +634,7 @@ namespace Barotrauma
         /// </summary>
         protected override void UnloadContent()
         {
+            TextureLoader.CancelAll();
             CoroutineManager.StopCoroutines("Load");
             Video.Close();
             VoipCapture.Instance?.Dispose();
@@ -680,7 +683,7 @@ namespace Barotrauma
         }
 
         public void OnLobbyJoinRequested(Steamworks.Data.Lobby lobby, Steamworks.SteamId friendId)
-    {
+        {
             SteamManager.JoinLobby(lobby.Id, true);
         }