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

Fix #9767: NRE in window_tile_inspector_paint

Browse Source
This commit is contained in:
Ted John
2019-08-08 12:42:09 +01:00
parent 379047cf43
commit f7c86debe3
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/openrct2-ui/windows/TileInspector.cpp
View File

@@ -1872,12 +1872,19 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
// Ride
auto trackElement = tileElement->AsTrack();
int16_t rideId = trackElement->GetRideIndex();
Ride* ride = get_ride(rideId);
rct_string_id rideType = RideNaming[ride->type].name;
gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_RIDE_TYPE, &rideType, COLOUR_DARK_GREEN, x, y);
auto ride = get_ride(rideId);
if (ride != nullptr)
{
auto rideType = RideNaming[ride->type].name;
gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_RIDE_TYPE, &rideType, COLOUR_DARK_GREEN, x, y);
}
gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_RIDE_ID, &rideId, COLOUR_DARK_GREEN, x, y + 11);
ride->FormatNameTo(gCommonFormatArgs);
gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_RIDE_NAME, gCommonFormatArgs, COLOUR_DARK_GREEN, x, y + 22);
if (ride != nullptr)
{
ride->FormatNameTo(gCommonFormatArgs);
gfx_draw_string_left(
dpi, STR_TILE_INSPECTOR_TRACK_RIDE_NAME, gCommonFormatArgs, COLOUR_DARK_GREEN, x, y + 22);
}
// Track
int16_t trackType = trackElement->GetTrackType();
int16_t sequenceNumber = trackElement->GetSequenceIndex();