From c923af084bde7418875f33ba4d803b5024b75dc9 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 18 Jun 2024 00:18:07 -0400 Subject: [PATCH] Don't bother with regular images when using the cache --- .../Builder/Props/ProjectionBuilder.cs | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/NewHorizons/Builder/Props/ProjectionBuilder.cs b/NewHorizons/Builder/Props/ProjectionBuilder.cs index e53ec40e..e37c58ef 100644 --- a/NewHorizons/Builder/Props/ProjectionBuilder.cs +++ b/NewHorizons/Builder/Props/ProjectionBuilder.cs @@ -529,7 +529,10 @@ namespace NewHorizons.Builder.Props // Load the inverted images used when displaying slide reels to a screen invertedImageLoader.PathsToLoad.Add((i, Path.Combine(Instance.ModHelper.Manifest.ModFolderPath, "Assets/textures/inverted_blank_slide_reel.png"))); } - imageLoader.PathsToLoad.Add((i, Path.Combine(Instance.ModHelper.Manifest.ModFolderPath, "Assets/textures/blank_slide_reel.png"))); + else + { + imageLoader.PathsToLoad.Add((i, Path.Combine(Instance.ModHelper.Manifest.ModFolderPath, "Assets/textures/blank_slide_reel.png"))); + } } else { @@ -538,7 +541,10 @@ namespace NewHorizons.Builder.Props // Load the inverted images used when displaying slide reels to a screen invertedImageLoader.PathsToLoad.Add((i, Path.Combine(mod.ModHelper.Manifest.ModFolderPath, INVERTED_SLIDE_CACHE_FOLDER, slideInfo.imagePath))); } - imageLoader.PathsToLoad.Add((i, Path.Combine(mod.ModHelper.Manifest.ModFolderPath, slideInfo.imagePath))); + else + { + imageLoader.PathsToLoad.Add((i, Path.Combine(mod.ModHelper.Manifest.ModFolderPath, slideInfo.imagePath))); + } } AddModules(slideInfo, ref slide, mod); @@ -548,15 +554,19 @@ namespace NewHorizons.Builder.Props if (cacheExists) { - if (useInvertedCache) - { - invertedImageLoader.Start(true); - } if (useAtlasCache) { atlasImageLoader.Start(false); } - imageLoader.Start(true); + // When using the inverted cache we never need the regular images + if (useInvertedCache) + { + invertedImageLoader.Start(true); + } + else + { + imageLoader.Start(true); + } return (invertedImageLoader, atlasImageLoader, imageLoader); }