Merge pull request #14843 from duncanspumpkin/boatTest

ImportExportTest: Add missing compare

src/openrct2/network/NetworkBase.cpp

@@ -37,7 +37,7 @@
 // This string specifies which version of network stream current build uses.
 // It is used for making sure only compatible builds get connected, even within
 // single OpenRCT2 version.
-#define NETWORK_STREAM_VERSION "17"
+#define NETWORK_STREAM_VERSION "18"
 #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
 
 static Peep* _pickup_peep = nullptr;

src/openrct2/ride/Vehicle.cpp

@@ -4656,7 +4656,7 @@ void Vehicle::UpdateBoatLocation()
     if (location.ToTileStart() == returnPosition.ToCoordsXY())
     {
         sub_state = 1;
-        BoatLocation = location;
+        BoatLocation = location.ToTileStart();
         return;
     }
 
@@ -4700,13 +4700,13 @@ void Vehicle::UpdateBoatLocation()
             continue;
         }
 
-        BoatLocation = trackLocation;
+        BoatLocation = trackLocation.ToTileStart();
         return;
     }
 
     CoordsXY trackLocation = TrackLocation;
     trackLocation += CoordsDirectionDelta[curDirection & 3];
-    BoatLocation = trackLocation;
+    BoatLocation = trackLocation.ToTileStart();
 }
 
 /**

test/tests/S6ImportExportTests.cpp

@@ -363,6 +363,7 @@ static void CompareSpriteDataVehicle(const Vehicle& left, const Vehicle& right)
     COMPARE_FIELD(colours_extended);
     COMPARE_FIELD(seat_rotation);
     COMPARE_FIELD(target_seat_rotation);
+    COMPARE_FIELD(BoatLocation);
     COMPARE_FIELD(IsCrashedVehicle);
 }