(c445db0f5) Lazy load item & structure sprites (loaded automatically when switching to the sub editor or instantiating an item/structure, so should not cause any mid-game freezes).

2019-04-04 11:09:32 +03:00
parent 66fa81bd3d
commit 1966bcb4ab
22 changed files with 133 additions and 584 deletions
@@ -123,8 +123,16 @@ namespace Barotrauma

        partial void InitProjSpecific()
        {
+            Prefab.sprite?.EnsureLazyLoaded();
+            Prefab.InventoryIcon?.EnsureLazyLoaded();
+            foreach (BrokenItemSprite brokenSprite in Prefab.BrokenSprites)
+            {
+                brokenSprite.Sprite.EnsureLazyLoaded();
+            }
+            
            foreach (var decorativeSprite in ((ItemPrefab)prefab).DecorativeSprites)
            {
+                decorativeSprite.Sprite.EnsureLazyLoaded();
                spriteAnimState.Add(decorativeSprite, new SpriteState());
            }
        }
@@ -607,9 +615,6 @@ namespace Barotrauma
            if (GameMain.GameSession?.CrewManager != null)
            {
                disallowedAreas.Add(GameMain.GameSession.CrewManager.GetCharacterListArea());
-                disallowedAreas.Add(new Rectangle(
-                    HUDLayoutSettings.ChatBoxArea.X - 50, HUDLayoutSettings.ChatBoxArea.Y, 
-                    HUDLayoutSettings.ChatBoxArea.Width + 50, HUDLayoutSettings.ChatBoxArea.Height));                
            }

            GUI.PreventElementOverlap(elementsToMove, disallowedAreas,