From 1cf4f17ee6004bc982cb9cf51eac159c521c0b7a Mon Sep 17 00:00:00 2001 From: James Warwood Date: Mon, 27 May 2019 21:37:31 +0100 Subject: [PATCH] Fix: Unable to use second skyscraper terrain edge style Code to check if selected edge style is valid was passing the wrong object type (surface instead of edge) to GetLoadedObject, causing that method to warn that the selected edge style index was out-of-range. --- src/openrct2/actions/SurfaceSetStyleAction.hpp | 2 +- src/openrct2/network/Network.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/actions/SurfaceSetStyleAction.hpp b/src/openrct2/actions/SurfaceSetStyleAction.hpp index 22ec7a0149..45e8d965e0 100644 --- a/src/openrct2/actions/SurfaceSetStyleAction.hpp +++ b/src/openrct2/actions/SurfaceSetStyleAction.hpp @@ -88,7 +88,7 @@ public: } const auto edgeObj = static_cast( - objManager.GetLoadedObject(OBJECT_TYPE_TERRAIN_SURFACE, _edgeStyle)); + objManager.GetLoadedObject(OBJECT_TYPE_TERRAIN_EDGE, _edgeStyle)); if (edgeObj == nullptr) { diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 8b3dae255b..3429d978fb 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -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 "34" +#define NETWORK_STREAM_VERSION "35" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr;