diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Content/ContentLoaders/TextureContentLoader.cs b/Engines/FlatRedBallXNA/FlatRedBall/Content/ContentLoaders/TextureContentLoader.cs index 7140414eb..13bc9c0fb 100644 --- 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 index 73a70732a..bd6ee7ed3 100644 --- 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 mDisposableDictionary = new Dictionary(StringComparer.OrdinalIgnoreCase); Dictionary mNonDisposableDictionary = new Dictionary(StringComparer.OrdinalIgnoreCase); - Dictionary mUnloadMethods = new Dictionary(); + Dictionary mUnloadMethods = new Dictionary(StringComparer.OrdinalIgnoreCase); /// /// 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 index 03d6092d6..b250b4aac 100644 --- a/FRBDK/Glue/GumPlugin/GumPlugin/Embedded/ContentManagerWrapper.cs +++ b/FRBDK/Glue/GumPlugin/GumPlugin/Embedded/ContentManagerWrapper.cs @@ -47,11 +47,6 @@ public T TryLoadContent(string contentName) public T LoadContent(string contentName) { -#if ANDROID || IOS - contentName = contentName.ToLowerInvariant(); -#endif - // alwasy prefer global content first: - return FlatRedBall.FlatRedBallServices.Load(contentName, ContentManagerName); } }