Merge branch 'master' of https://github.com/TheVillageGuy/Progress-Re…

…nderer
JonathanTroyer · Apr 11, 2024 · 5f8205b · 5f8205b
2 parents 7cb7a90 + 0560bd9
commit 5f8205b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Progress-Renderer.csproj b/Progress-Renderer.csproj
@@ -130,6 +130,7 @@
     <Content Include="News\UpdateFeatureDefs\UpdateFeatures.xml" />
     <Content Include="v1.4\Assemblies\Progress-Renderer.dll" />
     <Content Include="v1.5\Assemblies\Progress-Renderer.dll" />
+    <Content Include="v1.5\Textures\PRicon.png" />
   </ItemGroup>
   <ItemGroup>
     <None Include=".gitattributes" />

diff --git a/Source/MapComponents/MapComponent_RenderManager.cs b/Source/MapComponents/MapComponent_RenderManager.cs
@@ -1,4 +1,6 @@
-using System;
+#define VERSION_1_5
+
+using System;
 using System.Collections;
 using System.IO;
 using System.Threading.Tasks;
@@ -221,7 +223,9 @@ private IEnumerator DoRendering(bool forceRenderFullMap)
                 showPollutionOverlay = settings.showPollutionOverlay,
                 showTemperatureOverlay = settings.showTemperatureOverlay
             };
+#if VERSION_1_5
             var oldHighlight = Prefs.DotHighlightDisplayMode;
+#endif
 
             if (!PRModSettings.renderZones)
                 Find.PlaySettings.showZones = false;
@@ -233,8 +237,9 @@ private IEnumerator DoRendering(bool forceRenderFullMap)
                 Find.PlaySettings.showPollutionOverlay = false;
                 Find.PlaySettings.showTemperatureOverlay = false;
             }
+#if VERSION_1_5
             Prefs.DotHighlightDisplayMode = DotHighlightDisplayMode.None;
-
+#endif
             //TODO: Hide fog of war (stretch) 
 
             #endregion
@@ -478,9 +483,9 @@ private IEnumerator DoRendering(bool forceRenderFullMap)
             Find.PlaySettings.showTerrainAffordanceOverlay = oldVisibilities.showTerrainAffordanceOverlay;
             Find.PlaySettings.showPollutionOverlay = oldVisibilities.showPollutionOverlay;
             Find.PlaySettings.showTemperatureOverlay = oldVisibilities.showTemperatureOverlay;
-
+#if VERSION_1_5
             Prefs.DotHighlightDisplayMode = oldHighlight;
-
+#endif
             // Switch back to world view if needed
             if (rememberedWorldRendered)
             {