mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 15:24:30 +01:00
Code Issues Releases Wiki Activity

Fix #5677: Balloons pass through the ground and objects (#20483)

Browse Source
This commit is contained in:
mrmbernardi
2023-12-26 12:28:19 +01:00
committed by GitHub
parent 191b0c4d6d
commit 98a52efb7e
8 changed files with 98 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/openrct2/ride/TrackDesign.cpp
View File

@@ -83,17 +83,6 @@ static bool _trackDesignPlaceStateEntranceExitPlaced{};
static void TrackDesignPreviewClearMap();
static uint8_t TrackDesignGetEntranceStyle(const Ride& ride)
{
const auto* stationObject = ride.GetStationObject();
if (stationObject == nullptr)
return RCT12_STATION_STYLE_PLAIN;
const auto objectName = stationObject->GetIdentifier();
return GetStationStyleFromIdentifier(objectName);
}
ResultWithMessage TrackDesign::CreateTrackDesign(TrackDesignState& tds, const Ride& ride)
{
type = ride.type;
@@ -134,7 +123,7 @@ ResultWithMessage TrackDesign::CreateTrackDesign(TrackDesignState& tds, const Ri
lift_hill_speed = ride.lift_hill_speed;
num_circuits = ride.num_circuits;
entrance_style = TrackDesignGetEntranceStyle(ride);
entrance_style = ride.GetEntranceStyle();
max_speed = static_cast<int8_t>(ride.max_speed / 65536);
average_speed = static_cast<int8_t>(ride.average_speed / 65536);
ride_length = ride.GetTotalLength() / 65536;