(2a4bd39c2) Merge branch 'dev' into human-ai

2019-05-16 05:33:13 +03:00
parent a3db11876b
commit e367f900b8
54 changed files with 1092 additions and 297 deletions
@@ -11,6 +11,12 @@ namespace Barotrauma.Steam
 {
    partial class SteamManager
    {
+        private static List<string> initializationErrors = new List<string>();
+        public static IEnumerable<string> InitializationErrors
+        {
+            get { return initializationErrors; }
+        }
+
        private SteamManager()
        {
            try
@@ -26,12 +32,12 @@ namespace Barotrauma.Steam
            catch (DllNotFoundException)
            {
                isInitialized = false;
-                new GUIMessageBox(TextManager.Get("Error"), TextManager.Get("SteamDllNotFound"));
+                initializationErrors.Add("SteamDllNotFound");
            }
            catch (Exception)
            {
                isInitialized = false;
-                new GUIMessageBox(TextManager.Get("Error"), TextManager.Get("SteamClientInitFailed"));
+                initializationErrors.Add("SteamClientInitFailed");
            }

            if (!isInitialized)