(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:19:53 +03:00
parent 5208b922d8
commit bea7b58ff3
84 changed files with 1720 additions and 929 deletions
@@ -35,8 +35,6 @@ namespace Barotrauma
            this.graphicsDevice = graphicsDevice;
            componentStyles = new Dictionary<string, GUIComponentStyle>();

-            GameMain.Instance.OnResolutionChanged += () => { RescaleFonts(); };
-
            XDocument doc;
            try
            {
@@ -89,6 +87,8 @@ namespace Barotrauma
                        break;
                }
            }
+
+            GameMain.Instance.OnResolutionChanged += () => { RescaleFonts(); };
        }

        /// <summary>