mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix: Incomplete loop collision box allowed overlap (original bug)

This commit is contained in:
Simon Jarrett 2020-08-16 18:32:28 +01:00
parent 3dbee5edca
commit 9fb51c18d4
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@ -3,6 +3,7 @@
- Fix: [#12691] Ride graph tooltip incorrectly used count instead of number string.
- Fix: [#12694] Crash when switching ride types with construction window open.
- Fix: [#12701] Silent NSIS setup flag /S isn't silent, upgrade pop-up appears anyway.
- Fix: Incomplete loop collision box allowed overlapping track (original bug).
0.3.0 (2020-08-15)
------------------------------------------------------------------------

2
src/openrct2/network/NetworkBase.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 "0"
#define NETWORK_STREAM_VERSION "1"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr;

8
src/openrct2/ride/TrackData.cpp
View File

@ -1311,8 +1311,8 @@ static constexpr const rct_preview_track TrackBlocks040[] = {
{ 1, -32, 0, 16, 16, { 0b1111, 0b1100 }, 0 },
{ 2, -64, 0, 32, 96, { 0b0010, 0 }, 0 },
{ 3, -32, 0, 120, 16, { 0b0110, 0 }, 0 },
{ 4, -32, -32, 120, 0, { 0b0000, 0 }, 0 },
{ 5, 0, 0, 120, 0, { 0b0000, 0 }, 0 },
{ 4, -32, -32, 120, 0, { 0b0001, 0 }, 0 },
{ 5, 0, 0, 120, 0, { 0b0100, 0 }, 0 },
{ 6, 0, -32, 120, 16, { 0b1001, 0 }, 0 },
{ 7, 32, -32, 32, 96, { 0b1000, 0 }, 0 },
{ 8, 0, -32, 16, 16, { 0b1111, 0b0011 }, 0 },
@ -1325,8 +1325,8 @@ static constexpr const rct_preview_track TrackBlocks041[] = {
{ 1, -32, 0, 16, 16, { 0b1111, 0b1100 }, 0 },
{ 2, -64, 0, 32, 96, { 0b0001, 0 }, 0 },
{ 3, -32, 0, 120, 16, { 0b1001, 0 }, 0 },
{ 4, -32, 32, 120, 0, { 0b0000, 0 }, 0 },
{ 5, 0, 0, 120, 0, { 0b0000, 0 }, 0 },
{ 4, -32, 32, 120, 0, { 0b0010, 0 }, 0 },
{ 5, 0, 0, 120, 0, { 0b1000, 0 }, 0 },
{ 6, 0, 32, 120, 16, { 0b0110, 0 }, 0 },
{ 7, 32, 32, 32, 96, { 0b0100, 0 }, 0 },
{ 8, 0, 32, 16, 16, { 0b1111, 0b0011 }, 0 },