More work to remove case insensitivity for Android and iOS

vchelaru · Apr 6, 2024 · 7628974 · 7628974
1 parent a769387
commit 7628974
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Content/ContentLoaders/TextureContentLoader.cs b/Engines/FlatRedBallXNA/FlatRedBall/Content/ContentLoaders/TextureContentLoader.cs
@@ -143,13 +143,6 @@ private Texture2D LoadTextureFromFile(string loc)
 
                 Texture2D file = null;
 
-#if NET8_0_OR_GREATER && (ANDROID || IOS)
-                if(loc.StartsWith("./"))
-                {
-                    loc = loc.Substring(2);
-                }
-#endif
-
                 using (Stream titleStream = FileManager.GetStreamForFile(loc))
                 {
                     file = Texture2D.FromStream(Renderer.GraphicsDevice, titleStream);

diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Content/ContentManager.cs b/Engines/FlatRedBallXNA/FlatRedBall/Content/ContentManager.cs
@@ -67,7 +67,7 @@ public partial class ContentManager : Microsoft.Xna.Framework.Content.ContentMan
 		internal Dictionary<string, IDisposable> mDisposableDictionary = new Dictionary<string, IDisposable>(StringComparer.OrdinalIgnoreCase);
 		Dictionary<string, object> mNonDisposableDictionary = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
 
-		Dictionary<string, Action> mUnloadMethods = new Dictionary<string, Action>();
+		Dictionary<string, Action> mUnloadMethods = new Dictionary<string, Action>(StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
         /// If true FlatRedBall will look for cached content in the Global content manager even if

diff --git a/FRBDK/Glue/GumPlugin/GumPlugin/Embedded/ContentManagerWrapper.cs b/FRBDK/Glue/GumPlugin/GumPlugin/Embedded/ContentManagerWrapper.cs
@@ -47,11 +47,6 @@ public T TryLoadContent<T>(string contentName)
 
         public T LoadContent<T>(string contentName)
         {
-#if ANDROID || IOS
-			contentName = contentName.ToLowerInvariant();
-#endif
-            // alwasy prefer global content first:
-
             return FlatRedBall.FlatRedBallServices.Load<T>(contentName, ContentManagerName);
         }
     }