mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Fix: Unable to use second skyscraper terrain edge style

Browse Source 
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.
This commit is contained in:
James Warwood
2019-05-27 21:37:31 +01:00
committed by Michael Steenbeek
parent f26a1aee57
commit 1cf4f17ee6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/actions/SurfaceSetStyleAction.hpp
View File

@@ -88,7 +88,7 @@ public:
}
const auto edgeObj = static_cast<TerrainEdgeObject*>(
objManager.GetLoadedObject(OBJECT_TYPE_TERRAIN_SURFACE, _edgeStyle));
objManager.GetLoadedObject(OBJECT_TYPE_TERRAIN_EDGE, _edgeStyle));
if (edgeObj == nullptr)
{

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 "34"
#define NETWORK_STREAM_VERSION "35"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr;