(deebc187d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:25:48 +03:00
parent bf57a48c7e
commit 7ceba13e8f
28 changed files with 495 additions and 179 deletions
@@ -125,7 +125,7 @@ namespace Barotrauma

        public static int ContainedIndicatorHeight
        {
-            get { return (int)(15 * GameSettings.InventoryScale); }
+            get { return (int)(15 * UIScale); }
        }

        protected float prevUIScale = UIScale;