mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #9769: NRE in sub_6A4101

This commit is contained in:
Ted John 2019-08-08 12:45:17 +01:00
parent f7c86debe3
commit 53f228fc33
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/paint/tile_element/Paint.Path.cpp
View File

@ -442,7 +442,8 @@ static void sub_6A4101(
direction--;
// If text shown
if (direction < 2 && tile_element->AsPath()->GetRideIndex() != RIDE_ID_NULL && imageFlags == 0)
auto ride = get_ride(tile_element->AsPath()->GetRideIndex());
if (direction < 2 && ride != nullptr && imageFlags == 0)
{
uint16_t scrollingMode = railingEntry->scrolling_mode;
scrollingMode += direction;
@ -450,7 +451,6 @@ static void sub_6A4101(
set_format_arg(0, uint32_t, 0);
set_format_arg(4, uint32_t, 0);
Ride* ride = get_ride(tile_element->AsPath()->GetRideIndex());
if (ride->status == RIDE_STATUS_OPEN && !(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN))
{
set_format_arg(0, rct_string_id, STR_RIDE_ENTRANCE_NAME);