diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Content/ContentManager.cs b/Engines/FlatRedBallXNA/FlatRedBall/Content/ContentManager.cs index 1076583fc..048136ded 100644 --- a/Engines/FlatRedBallXNA/FlatRedBall/Content/ContentManager.cs +++ b/Engines/FlatRedBallXNA/FlatRedBall/Content/ContentManager.cs @@ -62,9 +62,10 @@ public partial class ContentManager : Microsoft.Xna.Framework.Content.ContentMan TextureContentLoader textureContentLoader = new TextureContentLoader(); //internal Dictionary mAssetTypeAssociation; - internal Dictionary mAssets; - internal Dictionary mDisposableDictionary = new Dictionary(); - Dictionary mNonDisposableDictionary = new Dictionary(); + internal Dictionary mAssets = new Dictionary(StringComparer.OrdinalIgnoreCase); + + internal Dictionary mDisposableDictionary = new Dictionary(StringComparer.OrdinalIgnoreCase); + Dictionary mNonDisposableDictionary = new Dictionary(StringComparer.OrdinalIgnoreCase); Dictionary mUnloadMethods = new Dictionary(); @@ -199,7 +200,6 @@ public ContentManager(string name, IServiceProvider serviceProvider) { mName = name; // mAssetTypeAssociation = new Dictionary(); - mAssets = new Dictionary(); ManualResetEventList = new List(); } @@ -208,7 +208,6 @@ public ContentManager(string name, IServiceProvider serviceProvider, string root { mName = name; // mAssetTypeAssociation = new Dictionary(); - mAssets = new Dictionary(); ManualResetEventList = new List(); } diff --git a/FRBDK/Glue/GumPlugin/GumPlugin/Embedded/ContentManagerWrapper.cs b/FRBDK/Glue/GumPlugin/GumPlugin/Embedded/ContentManagerWrapper.cs index 48c3fb82b..03d6092d6 100644 --- a/FRBDK/Glue/GumPlugin/GumPlugin/Embedded/ContentManagerWrapper.cs +++ b/FRBDK/Glue/GumPlugin/GumPlugin/Embedded/ContentManagerWrapper.cs @@ -50,6 +50,8 @@ public T LoadContent(string contentName) #if ANDROID || IOS contentName = contentName.ToLowerInvariant(); #endif + // alwasy prefer global content first: + return FlatRedBall.FlatRedBallServices.Load(contentName, ContentManagerName); } }