(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test

2019-04-04 11:10:29 +03:00
parent b08a31a68f
commit cc122f2bbf
52 changed files with 601 additions and 786 deletions
@@ -8,11 +8,14 @@ namespace Barotrauma
    {
        public static bool FollowSub = true;

-        private float defaultZoom = 1.3f;
+        private float? defaultZoom;
        public float DefaultZoom
        {
-            get { return defaultZoom; }
-            set { defaultZoom = MathHelper.Clamp(value, 0.5f, 2.0f); }
+            get { return defaultZoom ?? (GameMain.Config == null || GameMain.Config.EnableMouseLook ? 1.3f : 1.0f); }
+            set
+            {
+                defaultZoom = MathHelper.Clamp(value, 0.5f, 2.0f);
+            }
        }

        private float zoomSmoothness = 8.0f;