Fix texture corruption

LostArtefacts · Jun 17, 2024 · 6852961 · 6852961
1 parent 2551656
commit 6852961
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/TRRandomizerCore/Randomizers/Shared/TextureAllocator.cs b/TRRandomizerCore/Randomizers/Shared/TextureAllocator.cs
@@ -66,13 +66,15 @@ Dictionary<T, R> AllocateLevel(TRRScriptedLevel level, TRGData trgData)
             else if (Settings.TextureMode == TextureMode.Game)
             {
                 TRRScriptedLevel nextLevel = levelSwaps[levels.IndexOf(level)];
-                baseTextures.AddRange(textureCache[nextLevel]);
-                newTextures = textureCache[nextLevel];
-
-                while (newTextures.Count < trgData.Textures.Count)
+                List<ushort> textureSet = textureCache[nextLevel].RandomSelection(Generator, 
+                    Math.Min(trgData.Textures.Count, textureCache[nextLevel].Count));
+                while (textureSet.Count < trgData.Textures.Count)
                 {
-                    newTextures.Add(newTextures.RandomItem(Generator));
+                    textureSet.Add(textureCache[nextLevel].RandomItem(Generator));
                 }
+
+                baseTextures.AddRange(textureCache[nextLevel]);
+                newTextures.AddRange(textureSet);
             }
             else
             {