Fix #8720: Desync due to boats colliding with ghost pieces

This commit is contained in:
ζeh Matt 2019-02-19 11:39:48 +01:00 committed by Michael Steenbeek
parent 671016c24e
commit 8a6dd5c4dd
3 changed files with 5 additions and 1 deletions

View File

@ -67,6 +67,7 @@
- Fix: [#8591] Game loop does not run at a consistent tick rate of 40 Hz.
- Fix: [#8647] Marketing campaigns check for entry fees below £1 (original bug).
- Fix: [#8653] Crash when peeps attempt to enter a ride with no vehicles.
- Fix: [#8720] Desync due to boats colliding with ghost pieces.
- Improved: [#2940] Allow mouse-dragging to set patrol area (Singleplayer only).
- Improved: [#7730] Draw extreme vertical and lateral Gs red in the ride window's graph tab.
- Improved: [#7930] Automatically create folders for custom content.

View File

@ -30,7 +30,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 "39"
#define NETWORK_STREAM_VERSION "40"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static rct_peep* _pickup_peep = nullptr;

View File

@ -4656,6 +4656,9 @@ static bool vehicle_boat_is_location_accessible(const TileCoordsXYZ& location)
TileElement* tileElement = map_get_first_element_at(location.x, location.y);
do
{
if (tileElement->IsGhost() == true)
continue;
if (tileElement->GetType() == TILE_ELEMENT_TYPE_SURFACE)
{
int32_t waterZ = tileElement->AsSurface()->GetWaterHeight() * 2;