From 5e5752d49ddbc66e55c8bf4da40d61023bf3fa0c Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sat, 11 Jan 2020 23:27:01 +0100 Subject: [PATCH] Fix secondary prices being imported incorrectly from SV4 (#10543) An oversight that has been present since the very first version of the SV4 import code. --- distribution/changelog.txt | 1 + src/openrct2/rct1/RCT1.h | 2 +- src/openrct2/rct1/S4Importer.cpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 3be7243ccf..c2629c959c 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -11,6 +11,7 @@ - Fix: [#10420] Money effect causing false positive desync. - Fix: [#10477] Large Scenery cannot be placed higher using SHIFT. - Fix: [#10489] Hosts last player action not being synchronized. +- Fix: [#10543] Secondary shop item prices are not imported correctly from RCT1 saves. 0.2.4 (2019-10-28) ------------------------------------------------------------------------ diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index f4f5c8f00d..a62dd1cd40 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -187,7 +187,7 @@ struct rct1_ride uint8_t broken_vehicle; // 0x141 uint8_t broken_car; // 0x142 uint8_t breakdown_reason; // 0x143 - uint8_t unk_144[2]; // 0x144 + money16 price_secondary; // 0x144 union { struct diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index c90c468d59..c08b517ab5 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -984,6 +984,7 @@ private: // Finance / customers dst->upkeep_cost = src->upkeep_cost; dst->price = src->price; + dst->price_secondary = src->price_secondary; dst->income_per_hour = src->income_per_hour; dst->total_customers = src->total_customers; dst->profit = src->profit;