Merge pull request #182 from SmashPhil/feature/unstable-testing

Vehicle renderer hotfix for Camera+ and Mark That Pawn patches
SmashPhil · Aug 3, 2024 · 91c32ec · 91c32ec
2 parents 8bce0fe + b198fde
commit 91c32ec
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/1.5/Assemblies/UpdateLogTool.dll b/1.5/Assemblies/UpdateLogTool.dll
diff --git a/1.5/Assemblies/Vehicles.dll b/1.5/Assemblies/Vehicles.dll
diff --git a/About/About.xml b/About/About.xml
@@ -2,7 +2,7 @@
   <name>Vehicle Framework</name>
   <author>Smash Phil</author>
   <packageId>SmashPhil.VehicleFramework</packageId>
-  <modVersion>1.5.1700</modVersion>
+  <modVersion>1.5.1701</modVersion>
   <supportedVersions>
     <li>1.4</li>
     <li>1.5</li>

diff --git a/Source/Vehicles/Components/Rendering/VehicleRenderer.cs b/Source/Vehicles/Components/Rendering/VehicleRenderer.cs
@@ -35,13 +35,14 @@ public VehicleRenderer(VehiclePawn vehicle)
 		public PawnFirefoamDrawer FirefoamOverlays => firefoamOverlays;
 
 		//TODO 1.6 - Rename to RenderVehicleAt
+		//Mark That Pawn and Camera+ have patches on this method
 		public void RenderPawnAt(Vector3 drawLoc, float extraRotation, bool northSouthRotation)
 		{
-			RenderPawnAt(drawLoc, vehicle.FullRotation, extraRotation, northSouthRotation);
+			RenderPawnAt_TEMP(drawLoc, vehicle.FullRotation, extraRotation, northSouthRotation);
 		}
 
 		//TODO 1.6 - Rename to RenderVehicleAt
-		public void RenderPawnAt(Vector3 drawLoc, Rot8 rot, float extraRotation, bool northSouthRotation)
+		public void RenderPawnAt_TEMP(Vector3 drawLoc, Rot8 rot, float extraRotation, bool northSouthRotation)
 		{
 			if (!graphics.AllResolved)
 			{

diff --git a/Source/Vehicles/Components/Vehicles/VehiclePawn/VehiclePawn_Rendering.cs b/Source/Vehicles/Components/Vehicles/VehiclePawn/VehiclePawn_Rendering.cs
@@ -327,7 +327,7 @@ public virtual void DrawAt(Vector3 drawLoc, Rot8 rot, float extraRotation, bool
 		{
 			bool northSouthRotation = VehicleGraphic.EastDiagonalRotated && (FullRotation == Rot8.NorthEast || FullRotation == Rot8.SouthEast) ||
 				(VehicleGraphic.WestDiagonalRotated && (FullRotation == Rot8.NorthWest || FullRotation == Rot8.SouthWest));
-			Drawer.renderer.RenderPawnAt(drawLoc, rot, extraRotation, northSouthRotation);
+			Drawer.renderer.RenderPawnAt_TEMP(drawLoc, rot, extraRotation, northSouthRotation);
 
 			//TODO - consolidate rendering to new pawn node render system
 			foreach (VehicleHandler handler in HandlersWithPawnRenderer)

diff --git a/UpdateLog/UpdateLog.xml b/UpdateLog/UpdateLog.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <UpdateLog>
   <!--Can utilize Version.txt file placed in mod's root directory-->
-  <currentVersion>1.5.1700</currentVersion>
+  <currentVersion>1.5.1701</currentVersion>
   <!--Startup,GameInit,LoadedGame,NewGame-->
   <updateOn>GameInit</updateOn>
   <!--Full description shown in update page-->
   <description>&lt;title&gt;Notes&lt;/title&gt;&lt;font&gt;Small&lt;/font&gt;
 This update includes many Quality of Life features such as designating roads, reorienting aerial vehicles upon landing, reorienting vehicles upon pathing to a destination, and more.
 
 Be sure to take a look at the full list down below, and as always if you have feedback feel free to drop by the discord. Thanks!
+
+Note: This version is a hotfix of 1.5.1700, fixing the issue where Camera+'s and Mark That Pawn's patch on vehicle rendering broke. 
+If you removed either during the wait, you can now safely re-add them.
 &lt;title&gt;Bug Fixes&lt;/title&gt;&lt;font&gt;Tiny&lt;/font&gt;
 - Upgrading FuelCapacity wouldn't update amount needed to refuel, causing pawns to attempt to refuel in a loop.
 

diff --git a/Version.txt b/Version.txt
@@ -1 +1 @@
-1.5.1700
+1.5.1701