mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 17:42:29 +01:00
Code Issues Releases Wiki Activity

Fix #4917: Crash when opening research

Browse Source
This commit is contained in:
Michał Janiszewski
2016-12-26 14:09:22 +01:00
committed by Ted John
parent a05557cb7b
commit e25734819b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/windows/research.c
View File

@@ -402,13 +402,20 @@ void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dp
if (typeId != 0xFFFFFFFF) {
if (typeId >= 0x10000) {
rct_ride_entry *rideEntry = get_ride_entry(typeId & 0xFF);
if (rideEntry == NULL) {
return;
}
stringId = (rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME) ?
rideEntry->name :
((typeId >> 8) & 0xFF) + 2;
lastDevelopmentFormat = STR_RESEARCH_RIDE_LABEL;
} else {
stringId = get_scenery_group_entry(typeId)->name;
rct_scenery_set_entry *sse = get_scenery_group_entry(typeId);
if (sse == NULL) {
return;
}
stringId = sse->name;
lastDevelopmentFormat = STR_RESEARCH_SCENERY_LABEL;
}
gfx_draw_string_left_wrapped(dpi, &stringId, x, y, 266, lastDevelopmentFormat, COLOUR_BLACK);