mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Fix #12881: Guests' favourite rides not listed in the guest window

Browse Source
This commit is contained in:
Tulio Leao
2020-09-10 14:11:17 -03:00
committed by GitHub
parent ce00ae5d15
commit 4afbbed9bd
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -16,6 +16,7 @@
- Fix: [#12820] Title menu buttons not invalidating properly
- Fix: [#12845] Deleting ride with active ad campaign creates incorrect notification.
- Fix: [#12857] Incorrect Peep thoughts in imported RCT1 parks.
- Fix: [#12881] Guests' favourite rides are not listed in the guest window.
- Fix: Incomplete loop collision box allowed overlapping track (original bug).
- Technical: The required version of macOS has been lowered to 10.13 (High Sierra).

15
src/openrct2-ui/windows/Guest.cpp
View File

@@ -1765,15 +1765,16 @@ void window_guest_rides_paint(rct_window* w, rct_drawpixelinfo* dpi)
screenCoords.y = w->windowPos.y + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].bottom - 12;
auto ft = Formatter::Common();
ft.Add<rct_string_id>(STR_PEEP_FAVOURITE_RIDE_NOT_AVAILABLE);
if (peep->FavouriteRide != RIDE_ID_NULL)
auto ride = get_ride(peep->FavouriteRide);
if (ride != nullptr)
{
auto ride = get_ride(peep->FavouriteRide);
if (ride != nullptr)
{
ride->FormatNameTo(ft);
}
ride->FormatNameTo(ft);
}
else
{
ft.Add<rct_string_id>(STR_PEEP_FAVOURITE_RIDE_NOT_AVAILABLE);
}
DrawTextEllipsised(dpi, screenCoords, w->width - 14, STR_FAVOURITE_RIDE, ft, COLOUR_BLACK);
}