mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Fix secondary prices being imported incorrectly from SV4 (#10543)

Browse Source 
An oversight that has been present since the very first version of the SV4 import code.
This commit is contained in:
Michael Steenbeek
2020-01-11 23:27:01 +01:00
committed by GitHub
parent 20223eb5fb
commit 5e5752d49d
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -11,6 +11,7 @@
- Fix: [#10420] Money effect causing false positive desync. - Fix: [#10420] Money effect causing false positive desync.
- Fix: [#10477] Large Scenery cannot be placed higher using SHIFT. - Fix: [#10477] Large Scenery cannot be placed higher using SHIFT.
- Fix: [#10489] Hosts last player action not being synchronized. - 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) 0.2.4 (2019-10-28)
------------------------------------------------------------------------ ------------------------------------------------------------------------

2
src/openrct2/rct1/RCT1.h
View File

@@ -187,7 +187,7 @@ struct rct1_ride
uint8_t broken_vehicle; // 0x141 uint8_t broken_vehicle; // 0x141
uint8_t broken_car; // 0x142 uint8_t broken_car; // 0x142
uint8_t breakdown_reason; // 0x143 uint8_t breakdown_reason; // 0x143
uint8_t unk_144[2]; // 0x144 money16 price_secondary; // 0x144
union union
{ {
struct struct

1
src/openrct2/rct1/S4Importer.cpp
View File

@@ -984,6 +984,7 @@ private:
// Finance / customers // Finance / customers
dst->upkeep_cost = src->upkeep_cost; dst->upkeep_cost = src->upkeep_cost;
dst->price = src->price; dst->price = src->price;
dst->price_secondary = src->price_secondary;
dst->income_per_hour = src->income_per_hour; dst->income_per_hour = src->income_per_hour;
dst->total_customers = src->total_customers; dst->total_customers = src->total_customers;
dst->profit = src->profit; dst->profit = src->profit;