From 661be85193f0c199bb76a1ca46b8b4ab5ef5c6ef Mon Sep 17 00:00:00 2001 From: Duncan Date: Fri, 7 Feb 2020 23:02:33 +0000 Subject: [PATCH] Fix #10196: Cannot place doors at end of track corners (#10663) --- distribution/changelog.txt | 1 + src/openrct2/actions/WallPlaceAction.hpp | 2 +- src/openrct2/network/Network.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 98db4e6fd9..fc5001b7f4 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -9,6 +9,7 @@ - Fix: [#5249] No collision detection when building ride entrance at heights > 85.5m. - Fix: [#7784] Vehicle tab takes 1st car colour instead of tab_vehicle's colour. - Fix: [#8875] RCT1 competition scenarios are classified incorrectly. +- Fix: [#10196] Doors unable to be placed at end of track corners. - Fix: [#10228] Can't import RCT1 Deluxe from Steam. - Fix: [#10313] Path furniture can be placed on level crossings. - Fix: [#10325] Crash when banners have no text. diff --git a/src/openrct2/actions/WallPlaceAction.hpp b/src/openrct2/actions/WallPlaceAction.hpp index 7031052b24..eff0870d45 100644 --- a/src/openrct2/actions/WallPlaceAction.hpp +++ b/src/openrct2/actions/WallPlaceAction.hpp @@ -587,7 +587,7 @@ private: return false; } - direction = trackElement->GetDirection(); + direction = (trackElement->GetDirection() + TrackCoordinates[trackType].rotation_end) & TILE_ELEMENT_DIRECTION_MASK; if (direction != _edge) { return false; diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index fe823a3445..da1bc450e8 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -31,7 +31,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 "12" +#define NETWORK_STREAM_VERSION "13" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr;