Merge pull request #19 from jakobharder/devel/fix-scaling-issue

enforce dot as decimal separator
jakobharder · Oct 18, 2023 · c451877 · c451877
2 parents bba4891 + 13eb2a8
commit c451877
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/resources/Changelog.md b/resources/Changelog.md
@@ -2,6 +2,12 @@
 
 ## 0.5 - Remastered Characters (2023-10-15)
 
+### 0.5.1
+
+- Fixed scaling issue in environments using comma as decimal separator (e.g. German)
+
+### Changes
+
 - Toggle fullscreen/windows with Alt+Enter
 - Remastered graphics
   - All remaining location maps

diff --git a/source/Burntime.MonoGame/BurntimeGame.cs b/source/Burntime.MonoGame/BurntimeGame.cs
@@ -52,11 +52,11 @@ public void DecreaseLoadingCount()
 
         public bool IsLoading { get; set; }
 
-#if (DEBUG)
+// #if (DEBUG)
         public bool FullScreen { get; set; } = false;
-#else
-        public bool FullScreen { get; set; } = true;
-#endif
+// #else
+//         public bool FullScreen { get; set; } = true;
+// #endif
         bool _initialized = false;
 
         public BurntimeGame()

diff --git a/source/Burntime.Platform/IO/ConfigSection.cs b/source/Burntime.Platform/IO/ConfigSection.cs
@@ -1,4 +1,6 @@
-namespace Burntime.Platform.IO;
+using System.Globalization;
+
+namespace Burntime.Platform.IO;
 
 public class ConfigSection
 {
@@ -227,15 +229,15 @@ public Vector2f GetVector2f(string key, Vector2f defaultValue)
         string[] token = str.Split(new char[] { 'x' });
         if (token.Length == 1)
         {
-            if (!float.TryParse(token[0], out v.x))
+            if (!float.TryParse(token[0], NumberStyles.Float, CultureInfo.InvariantCulture, out v.x))
                 return defaultValue;
             return v;
         }
         if (token.Length != 2)
             return v;
-        if (!float.TryParse(token[0], out v.x))
+        if (!float.TryParse(token[0], NumberStyles.Float, CultureInfo.InvariantCulture, out v.x))
             return defaultValue;
-        if (!float.TryParse(token[1], out v.y))
+        if (!float.TryParse(token[1], NumberStyles.Float, CultureInfo.InvariantCulture, out v.y))
             return defaultValue;
         return v;
     }
@@ -246,7 +248,7 @@ public float GetFloat(string key)
             return 0;
 
         float res = 0;
-        if (!float.TryParse(Get(key), System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture, out res))
+        if (!float.TryParse(Get(key), NumberStyles.Float, CultureInfo.InvariantCulture, out res))
             return 0;
         return res;
     }
@@ -263,7 +265,7 @@ public float[] GetFloats(string key)
             float[] floats = new float[strs.Length];
             for (int i = 0; i < strs.Length; i++)
             {
-                if (!float.TryParse(strs[i], System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture, out floats[i]))
+                if (!float.TryParse(strs[i], NumberStyles.Float, CultureInfo.InvariantCulture, out floats[i]))
                     floats[i] = 0;
             }
             return floats;