mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +01:00
Code Issues Releases Wiki Activity

Fix #7854: Cannot build custom Spiral RC; dummy entries in track designs list (#10814)

Browse Source
This commit is contained in:
Michael Steenbeek
2020-02-22 19:06:57 +01:00
committed by GitHub
parent e16a53df1d
commit 86c7dbf1d5
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2-ui/windows/TrackList.cpp
View File

@@ -239,13 +239,6 @@ static void window_track_list_close(rct_window* w)
*/
static void window_track_list_select(rct_window* w, int32_t listIndex)
{
// Displays a message if the ride can't load, fix #4080
if (_loadedTrackDesign == nullptr)
{
context_show_error(STR_CANT_BUILD_PARK_ENTRANCE_HERE, STR_TRACK_LOAD_FAILED_ERROR);
return;
}
audio_play_sound(SoundId::Click1, 0, w->x + (w->width / 2));
if (!(gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER))
{
@@ -258,7 +251,14 @@ static void window_track_list_select(rct_window* w, int32_t listIndex)
listIndex--;
}
if (_loadedTrackDesign && (_loadedTrackDesign->track_flags & TRACK_DESIGN_FLAG_SCENERY_UNAVAILABLE))
// Displays a message if the ride can't load, fix #4080
if (_loadedTrackDesign == nullptr)
{
context_show_error(STR_CANT_BUILD_PARK_ENTRANCE_HERE, STR_TRACK_LOAD_FAILED_ERROR);
return;
}
if (_loadedTrackDesign->track_flags & TRACK_DESIGN_FLAG_SCENERY_UNAVAILABLE)
{
gTrackDesignSceneryToggle = true;
}

2
src/openrct2/ride/TrackDesignRepository.cpp
View File

@@ -35,7 +35,7 @@ struct TrackRepositoryItem
{
std::string Name;
std::string Path;
uint8_t RideType = 0;
uint8_t RideType = RIDE_TYPE_NULL;
std::string ObjectEntry;
uint32_t Flags = 0;
};