From e433ed7d7c4de85e2eaa92436700c7745cab772a Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 20 Mar 2020 16:06:12 +0100 Subject: [PATCH 1/2] Fix #8151: Game freezes upon demolishing mazes at odd heights Co-Authored-By: Felix Pelletier --- distribution/changelog.txt | 1 + src/openrct2/actions/MazeSetTrackAction.hpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 8cb7c34030..b0449b05de 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -15,6 +15,7 @@ - Fix: [#7784] Vehicle tab takes 1st car colour instead of tab_vehicle's colour. - Fix: [#7854] Cannot build a custom spiral roller coaster design. - Fix: [#7854] Empty entries in spiral roller coaster designs list. +- Fix: [#8151] Game freezes upon demolishing mazes at odd heights. - Fix: [#8875] RCT1 competition scenarios are classified incorrectly. - Fix: [#10176] Mistake in the sprite for the land tool's 6x6 grid. - Fix: [#10196] Doors unable to be placed at end of track corners. diff --git a/src/openrct2/actions/MazeSetTrackAction.hpp b/src/openrct2/actions/MazeSetTrackAction.hpp index da3923d03f..4e980be78a 100644 --- a/src/openrct2/actions/MazeSetTrackAction.hpp +++ b/src/openrct2/actions/MazeSetTrackAction.hpp @@ -86,7 +86,7 @@ public: res->ErrorMessage = STR_TILE_ELEMENT_LIMIT_REACHED; return res; } - if ((_loc.z & 0xF) != 0) + if ((_loc.z & 0xF) != 0 && _mode == GC_SET_MAZE_TRACK_BUILD) { res->Error = GA_ERROR::UNKNOWN; res->ErrorMessage = STR_CONSTRUCTION_ERR_UNKNOWN; From cd18697d311b7c6e450bfd6da071b823b9f72ba1 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 20 Mar 2020 21:37:57 +0100 Subject: [PATCH 2/2] Bump network version --- src/openrct2/network/Network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 6050a5a7fa..fe1a23488f 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 "23" +#define NETWORK_STREAM_VERSION "24" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr;