mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00
Code Issues Releases Wiki Activity

Warn user if unsupported vehicle or element used

Browse Source
This commit is contained in:
spacek531
2022-07-04 12:06:59 -07:00
committed by GitHub
parent b499a0517f
commit 312ad3e3ce
5 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,10 +87,10 @@ rct_string_id TrackDesign::CreateTrackDesign(TrackDesignState& tds, const Ride&
if (object != nullptr)
{
auto entry = object->GetObjectEntry();
// Remove this check for new track design format
if (entry.IsEmpty())
{
// TODO create a new error message for `JSON objects are unsupported`
return STR_UNKNOWN_OBJECT_TYPE;
return STR_VEHICLE_UNSUPPORTED_TD6;
}
vehicle_object = ObjectEntryDescriptor(entry);
}
@@ -199,6 +199,12 @@ rct_string_id TrackDesign::CreateTrackDesignTrack(TrackDesignState& tds, const R
do
{
// Remove this check for new track design format
if (trackElement.element->AsTrack()->GetTrackType() > TrackElemType::HighestAlias)
{
return STR_TRACK_ELEM_UNSUPPORTED_TD6;
}
TrackDesignTrackElement track{};
track.type = trackElement.element->AsTrack()->GetTrackType();