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

Fix #11126: Cannot place Frightmare track design (#11186)

This commit is contained in:
Michael Steenbeek 2020-04-01 17:37:09 +02:00 committed by GitHub
parent e1e8e2bec0
commit 1e70c4806e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@ -10,6 +10,7 @@
- Fix: [#11005] Company value overflows.
- Fix: [#11027] Third color on walls becomes black when saving.
- Fix: [#11063] Scrolling position persists when switching tabs in the scenery window.
- Fix: [#11126] Cannot place Frightmare track design.
- Improved: [#11157] Slimmer virtual floor lines.
0.2.5 (2020-03-24)

13
src/openrct2/actions/TrackPlaceAction.hpp
View File

@ -212,7 +212,7 @@ public:
return std::make_unique<TrackPlaceActionResult>(GA_ERROR::INVALID_PARAMETERS, STR_TOO_LOW);
}
int32_t baseZ = mapLoc.z;
int32_t baseZ = floor2(mapLoc.z, COORDS_Z_STEP);
int32_t clearanceZ = trackBlock->var_07;
if (trackBlock->flags & RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL && RideData5[ride->type].clearance_height > 24)
@ -224,7 +224,7 @@ public:
clearanceZ += RideData5[ride->type].clearance_height;
}
clearanceZ += baseZ;
clearanceZ = floor2(clearanceZ, COORDS_Z_STEP) + baseZ;
if (clearanceZ > MAX_TRACK_HEIGHT)
{
@ -454,6 +454,7 @@ public:
auto quarterTile = trackBlock->var_08.Rotate(_origin.direction);
int32_t baseZ = floor2(mapLoc.z, COORDS_Z_STEP);
int32_t clearanceZ = trackBlock->var_07;
if (trackBlock->flags & RCT_PREVIEW_TRACK_FLAG_IS_VERTICAL && RideData5[ride->type].clearance_height > 24)
{
@ -464,8 +465,8 @@ public:
clearanceZ += RideData5[ride->type].clearance_height;
}
clearanceZ = clearanceZ + mapLoc.z;
const auto mapLocWithClearance = CoordsXYRangedZ(mapLoc, mapLoc.z, clearanceZ);
clearanceZ = floor2(clearanceZ, COORDS_Z_STEP) + baseZ;
const auto mapLocWithClearance = CoordsXYRangedZ(mapLoc, baseZ, clearanceZ);
uint8_t crossingMode = (ride->type == RIDE_TYPE_MINIATURE_RAILWAY && _trackType == TRACK_ELEM_FLAT)
? CREATE_CROSSING_MODE_TRACK_OVER_PATH
@ -515,7 +516,7 @@ public:
if (surfaceElement == nullptr)
return std::make_unique<TrackPlaceActionResult>(GA_ERROR::UNKNOWN, STR_NONE);
int32_t supportHeight = mapLoc.z - surfaceElement->GetBaseZ();
int32_t supportHeight = baseZ - surfaceElement->GetBaseZ();
if (supportHeight < 0)
{
supportHeight = (10 * COORDS_Z_STEP);
@ -657,7 +658,7 @@ public:
tempLoc.x += CoordsDirectionDelta[tempDirection].x;
tempLoc.y += CoordsDirectionDelta[tempDirection].y;
tempDirection = direction_reverse(tempDirection);
wall_remove_intersecting_walls(mapLocWithClearance, tempDirection & 3);
wall_remove_intersecting_walls({ tempLoc, baseZ, clearanceZ }, tempDirection & 3);
}
}
}

2
src/openrct2/network/Network.cpp
View File

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