Fixed FNA compile error.

vchelaru · Jul 9, 2024 · 40b3165 · 40b3165
1 parent cb5789a
commit 40b3165
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Content/ContentLoaders/TextureContentLoader.cs b/Engines/FlatRedBallXNA/FlatRedBall/Content/ContentLoaders/TextureContentLoader.cs
@@ -237,7 +237,7 @@ public static Texture2D MakePremultiplied(Texture2D file)
 #if MONOGAME
                     premultSpriteBatch.Begin(SpriteSortMode.Immediate, blendColor, samplerState: SamplerState.PointClamp);
 #else
-                    spriteBatch.Begin(SpriteSortMode.Immediate, blendColor, SamplerState.PointClamp, null, null);
+                    premultSpriteBatch.Begin(SpriteSortMode.Immediate, blendColor, SamplerState.PointClamp, null, null);
 #endif
                     premultSpriteBatch.Draw(file, position, Color.White);
                     premultSpriteBatch.End();
@@ -255,7 +255,7 @@ public static Texture2D MakePremultiplied(Texture2D file)
 #if MONOGAME
                     premultSpriteBatch.Begin(SpriteSortMode.Immediate, blendAlpha, samplerState: SamplerState.PointClamp);
 #else
-                    spriteBatch.Begin(SpriteSortMode.Immediate, blendAlpha, SamplerState.PointClamp, null, null);
+                    premultSpriteBatch.Begin(SpriteSortMode.Immediate, blendAlpha, SamplerState.PointClamp, null, null);
 #endif
                     premultSpriteBatch.Draw(file, position, Color.White);
                     premultSpriteBatch.End();

diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Utilities/StringFunctions.cs b/Engines/FlatRedBallXNA/FlatRedBall/Utilities/StringFunctions.cs
@@ -776,12 +776,18 @@ public static void MakeNameUnique<T>(T nameable, IList<T> list)
             }
         }
 
+        /// <summary>
+        /// Adds or increments the number at the end of the nameable's Name until it is unique in the list.
+        /// </summary>
+        /// <typeparam name="T">Nameable type</typeparam>
+        /// <param name="nameable">The nameable instance</param>
+        /// <param name="list">The list of other nameables.</param>
         public static void MakeNameUnique<T>(T nameable, IEnumerable<T> list)
             where T : INameable
         {
             var count = list.Count();
 
-            for (int i = 0; i < list.Count(); i++)
+            for (int i = 0; i < count; i++)
             {
                 var atI = list.ElementAt(i);