From 7cdb8f162acacfc4cd12ad1df9fae306ff68dd7b Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Sat, 20 Nov 2021 13:52:48 +0100
Subject: [PATCH] Fix: Track designs of some ride types incorrectly exported to
 TD6

---
 distribution/changelog.txt       | 1 +
 src/openrct2/rct2/T6Exporter.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index d02f861922..c3e89c89e2 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -9,6 +9,7 @@
 - Fix: [#15878] Crash when opening a ride window for a corrupted vehicle.
 - Fix: [#15908] Crash when track elements have no ride assigned.
 - Fix: [#15919] Research status incorrectly considered for scenery when in editor modes.
+- Fix: [#15938] Track designs of some ride types are incorrectly exported to TD6.
 
 0.3.5 (2021-11-06)
 ------------------------------------------------------------------------
diff --git a/src/openrct2/rct2/T6Exporter.cpp b/src/openrct2/rct2/T6Exporter.cpp
index 33554c5a83..5b0d2adcd2 100644
--- a/src/openrct2/rct2/T6Exporter.cpp
+++ b/src/openrct2/rct2/T6Exporter.cpp
@@ -48,7 +48,7 @@ bool T6Exporter::SaveTrack(const utf8* path)
 bool T6Exporter::SaveTrack(OpenRCT2::IStream* stream)
 {
     OpenRCT2::MemoryStream tempStream;
-    tempStream.WriteValue<uint8_t>(_trackDesign->type);
+    tempStream.WriteValue<uint8_t>(OpenRCT2RideTypeToRCT2RideType(_trackDesign->type));
     tempStream.WriteValue<uint8_t>(_trackDesign->vehicle_type);
     tempStream.WriteValue<uint32_t>(_trackDesign->flags);
     tempStream.WriteValue<uint8_t>(static_cast<uint8_t>(_trackDesign->ride_mode));