(33ab1e038) Add buttons for resetting the settings to the defaults and setting the default keybindings. TODO: pressing the buttons should refresh the settings frame instead of closing it.

2019-04-04 11:10:14 +03:00
parent 371bcb11c1
commit b08a31a68f
63 changed files with 1069 additions and 668 deletions
@@ -123,16 +123,8 @@ 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());
            }
        }
@@ -615,9 +607,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,