From 8b7f60d10da95a3be523a3f209ed3c86bdf519ba Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sat, 29 Jan 2022 15:46:24 +0100 Subject: [PATCH] =?UTF-8?q?Fix:=20Incorrect=20=E2=80=9CSame=20price=20thro?= =?UTF-8?q?ughout=20park=E2=80=9D=20for=20RCT1=20import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- distribution/changelog.txt | 3 ++- src/openrct2/rct1/RCT1.h | 2 +- src/openrct2/rct1/S4Importer.cpp | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index de2b642a96..6161eacd16 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -27,7 +27,7 @@ - Fix: [#15830] Objects with RCT1 images are very glitchy if OpenRCT2 is not linked to an RCT1 install. - Fix: [#15947, #15960] Removing a flat ride results in an error message and duplicate structures. - Fix: [#15998] Cannot set map size to the actual maximum. -- Fix: [#16007] Scenario Editor "Entry Price" appears to the right of the value field. +- Fix: [#16007] Scenario Editor “Entry Price” appears to the right of the value field. - Fix: [#16008] Tile Inspector can select elements from last tile without reselecting it. - Fix: [#16024] Go-Karts with more than 32 vehicles do not colour themselves correctly. - Fix: [#16063] Object Selection preview for objects with glass is broken. @@ -38,6 +38,7 @@ - Fix: [#16327] Crash on malformed network packet. - Fix: [#16449] [Plugin] Viewport doesn't hide when switching tabs. - Fix: [#16450] Banner style not copied when using tile inspector. +- Fix: [#16542] “Same price throughout park” status not correctly imported for RCT1 saves. - Fix: [objects#165] Glitch when Bengal Tiger Cars go through a corner. 0.3.5.1 (2021-11-21) diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index 554c3cfa7f..530c69b4c1 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -734,7 +734,7 @@ namespace RCT1 uint16_t map_size_unk_b; uint16_t map_size; uint16_t map_size_max_xy; - uint32_t same_price_flags; + uint32_t same_price_throughout; uint16_t unk_199C94; uint8_t unk_199C96[3]; uint8_t water_colour; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 519643a287..e8118c1325 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -2212,6 +2212,11 @@ namespace RCT1 gParkSize = _s4.park_size; gTotalRideValueForMoney = _s4.total_ride_value_for_money; + gSamePriceThroughoutPark = 0; + if (_gameVersion == FILE_VERSION_RCT1_LL) + { + gSamePriceThroughoutPark = _s4.same_price_throughout; + } } void ConvertResearchEntry(::ResearchItem* dst, uint8_t srcItem, uint8_t srcType)