mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 18:31:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix #14032: NPE in window_tile_inspector_scrollpaint()

Browse source
This commit is contained in:
Michael Steenbeek 2021-02-09 23:02:31 +01:00 committed by GitHub
parent f75a48d8dc
commit 397512f4d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/openrct2-ui/windows/TileInspector.cpp
View file

@ -2282,20 +2282,26 @@ static void window_tile_inspector_scrollpaint(rct_window* w, rct_drawpixelinfo*
typeName = language_get_string(STR_RIDE_COMPONENT_TRACK_CAPITALISED);
break;
case TILE_ELEMENT_TYPE_SMALL_SCENERY:
{
const auto* entry = tileElement->AsSmallScenery()->GetEntry();
snprintf(
buffer, sizeof(buffer), "%s (%s)", language_get_string(STR_OBJECT_SELECTION_SMALL_SCENERY),
language_get_string(get_small_scenery_entry(tileElement->AsSmallScenery()->GetEntryIndex())->name));
entry != nullptr ? language_get_string(entry->name) : "");
typeName = buffer;
break;
}
case TILE_ELEMENT_TYPE_ENTRANCE:
typeName = language_get_string(STR_RIDE_CONSTRUCTION_ENTRANCE);
break;
case TILE_ELEMENT_TYPE_WALL:
{
const auto* entry = tileElement->AsWall()->GetEntry();
snprintf(
buffer, sizeof(buffer), "%s (%s)", language_get_string(STR_TILE_INSPECTOR_WALL),
language_get_string(tileElement->AsWall()->GetEntry()->name));
entry != nullptr ? language_get_string(entry->name) : "");
typeName = buffer;
break;
}
case TILE_ELEMENT_TYPE_LARGE_SCENERY:
typeName = language_get_string(STR_OBJECT_SELECTION_LARGE_SCENERY);
break;