Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git

2022-04-28 12:36:24 -03:00
parent cb50c69fc6 15d18e6ff6
commit 4277dd447c
91 changed files with 1140 additions and 491 deletions
@@ -1170,6 +1170,9 @@ namespace Barotrauma
 #endif
                CreateEntityElement(ep, entitiesPerRow, allEntityList.Content);
            }
+            allEntityList.Content.RectTransform.SortChildren((i1, i2) =>
+               string.Compare(((MapEntityPrefab)i1.GUIComponent.UserData)?.Name.Value, (i2.GUIComponent.UserData as MapEntityPrefab)?.Name.Value, StringComparison.Ordinal));
+
        }

        private void CreateEntityElement(MapEntityPrefab ep, int entitiesPerRow, GUIComponent parent)
@@ -1911,6 +1914,7 @@ namespace Barotrauma
                }
                SubmarineInfo.RefreshSavedSub(savePath);
                if (prevSavePath != null && prevSavePath != savePath) { SubmarineInfo.RefreshSavedSub(prevSavePath); }
+                MainSub.Info.PreviewImage = SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.FilePath == savePath)?.PreviewImage; 

                string downloadFolder = Path.GetFullPath(SaveUtil.SubmarineDownloadFolder);
                linkedSubBox.ClearChildren();