Unstable 0.16.1.0

Barotrauma/BarotraumaClient/ClientSource/Utils/LocalizationCSVtoXML.cs

@@ -89,7 +89,17 @@ namespace Barotrauma
 
                 for (int j = 0; j < infoTextFiles.Count; j++)
                 {
-                    List<string> xmlContent = ConvertInfoTextToXML(File.ReadAllLines(infoTextFiles[j], Encoding.UTF8), language);
+
+                    List<string> xmlContent = null;
+                    try
+                    {
+                        xmlContent = ConvertInfoTextToXML(File.ReadAllLines(infoTextFiles[j], Encoding.UTF8), language);
+                    }
+                    catch (Exception e)
+                    {
+                        DebugConsole.ThrowError("InfoText Localization .csv to .xml conversion failed for: " + infoTextFiles[j], e);
+                        continue;
+                    }
                     if (xmlContent == null)
                     {
                         DebugConsole.ThrowError("InfoText Localization .csv to .xml conversion failed for: " + infoTextFiles[j]);

Barotrauma/BarotraumaClient/ClientSource/Utils/WikiImage.cs

@@ -122,7 +122,7 @@ namespace Barotrauma
         {
             int width = 4096; int height = 4096;
 
-            Rectangle subDimensions = sub.Borders;
+            Rectangle subDimensions = sub.CalculateDimensions(false);
             Vector2 viewPos = subDimensions.Center.ToVector2();
             float scale = Math.Min(width / (float)subDimensions.Width, height / (float)subDimensions.Height);