From 984a660ad7775a2093cf2f0a4b131a98fb63e47e Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sun, 9 May 2021 18:53:35 +0200 Subject: [PATCH] Fix RCT1 American-style Steam Trains import --- distribution/changelog.txt | 1 + src/openrct2/rct1/RCT1.h | 2 ++ src/openrct2/rct1/Tables.cpp | 6 +++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 7665964bd4..69086689c3 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -13,6 +13,7 @@ - Fix: [#14315] Crash when trying to rename Air Powered Vertical Coaster in Korean. - Fix: [#14330] join_server uses default_port from config. - Fix: [#14493] [Plugin] isHidden only works for tile elements up to the first element with a base height of over 32. +- Fix: [#14604] American-style Steam Trains are not imported correctly from RCT1 saves. 0.3.3 (2021-03-13) ------------------------------------------------------------------------ diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index 3e759b6ce8..ff33e446dd 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -1240,6 +1240,8 @@ enum WATER_COASTER_BOAT = 99, WATER_COASTER_INVISIBLE = 101, RIVER_RAFT = 103, + MINIATURE_RAILWAY_AMERICAN_TENDER = 104, + MINIATURE_RAILWAY_AMERICAN_LOCOMOTIVE = 105, }; enum diff --git a/src/openrct2/rct1/Tables.cpp b/src/openrct2/rct1/Tables.cpp index 73918a7a67..586834a7c9 100644 --- a/src/openrct2/rct1/Tables.cpp +++ b/src/openrct2/rct1/Tables.cpp @@ -364,7 +364,7 @@ namespace RCT1 { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_BLACK }, // RCT1_VEHICLE_TYPE_FACEOFF_CARS, { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_BLACK }, // RCT1_VEHICLE_TYPE_JET_SKIS, { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_BLACK }, // RCT1_VEHICLE_TYPE_RAFT_BOATS, - { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_BLACK }, // RCT1_VEHICLE_TYPE_AMERICAN_STYLE_STEAM_TRAIN, + { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_YELLOW }, // RCT1_VEHICLE_TYPE_AMERICAN_STYLE_STEAM_TRAIN, { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_BLACK }, // RCT1_VEHICLE_TYPE_AIR_POWERED_COASTER_TRAIN, { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_BLACK }, // RCT1_VEHICLE_TYPE_SUSPENDED_WILD_MOUSE_CARS, // Inverted Hairpin in RCT2 { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_BLACK }, // RCT1_VEHICLE_TYPE_ENTERPRISE_WHEEL @@ -540,8 +540,8 @@ namespace RCT1 1, // WATER_COASTER_INVISIBLE 0, 0, // RIVER_RAFT - 0, - 0, + 1, // MINIATURE_RAILWAY_AMERICAN_TENDER + 0, // MINIATURE_RAILWAY_AMERICAN_LOCOMOTIVE 0, 0, 0,