mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 05:32:54 +01:00
Code Issues Releases Wiki Activity

Fix import of park entrance locations

Browse Source 
gParkEntrances was changed to sint32 positions from sint16 positions in f4ac2b4d5b. This caused a regression as the locations were not being sign extended when imported from S6 files.
This commit is contained in:
Ted John
2018-03-14 18:34:29 +00:00
committed by Michael Steenbeek
parent c21143505f
commit edb7e7112a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/network/Network.cpp
View File

@@ -33,7 +33,7 @@
// This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "40"
#define NETWORK_STREAM_VERSION "41"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static rct_peep* _pickup_peep = nullptr;

6
src/openrct2/scenario/Scenario.h
View File

@@ -244,9 +244,9 @@ struct rct_s6_data {
uint8 current_interest_rate;
uint8 pad_0135934B;
uint32 same_price_throughout_extended;
uint16 park_entrance_x[RCT12_MAX_PARK_ENTRANCES];
uint16 park_entrance_y[RCT12_MAX_PARK_ENTRANCES];
uint16 park_entrance_z[RCT12_MAX_PARK_ENTRANCES];
sint16 park_entrance_x[RCT12_MAX_PARK_ENTRANCES];
sint16 park_entrance_y[RCT12_MAX_PARK_ENTRANCES];
sint16 park_entrance_z[RCT12_MAX_PARK_ENTRANCES];
uint8 park_entrance_direction[RCT12_MAX_PARK_ENTRANCES];
char scenario_filename[256];
uint8 saved_expansion_pack_names[3256];