(6eeea9b7c) v0.9.10.0.0

This commit is contained in:
Joonas Rikkonen
2020-06-04 16:41:07 +03:00
parent ce4ccd99ac
commit eeac247a8e
366 changed files with 7772 additions and 3692 deletions
@@ -1,9 +1,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using Barotrauma.IO;
using System.Linq;
using System.Text;
using System.Xml;
using System.Xml.Linq;
namespace Barotrauma
@@ -116,7 +115,7 @@ namespace Barotrauma
doc = XMLExtensions.TryLoadXml(ConfigFile);
break;
}
catch (IOException)
catch (System.IO.IOException)
{
if (i == maxLoadRetries) { break; }
DebugConsole.NewMessage("Opening karma settings file \"" + ConfigFile + "\" failed, retrying in 250 ms...");
@@ -171,7 +170,7 @@ namespace Barotrauma
doc.Root.Add(preset.Value);
}
XmlWriterSettings settings = new XmlWriterSettings
System.Xml.XmlWriterSettings settings = new System.Xml.XmlWriterSettings
{
Indent = true,
NewLineOnAttributes = true
@@ -184,11 +183,11 @@ namespace Barotrauma
{
using (var writer = XmlWriter.Create(ConfigFile, settings))
{
doc.Save(writer);
doc.SaveSafe(writer);
}
break;
}
catch (IOException)
catch (System.IO.IOException)
{
if (i == maxLoadRetries) { throw; }