mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity

Revert "Guard against null banners (#11078)"

Browse Source 
This is being reverted now that we have replay records uploaded as part
of the backtrace.io information to try figuring out the root cause.

This reverts commit 47b6139546.
This commit is contained in:
Michał Janiszewski
2020-04-03 09:55:01 +02:00
parent 27da48336a
commit 85d6fa8c8b
2 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/openrct2-ui/interface/ViewportInteraction.cpp
View File

@@ -327,17 +327,15 @@ int32_t viewport_interaction_get_item_right(const ScreenCoordsXY& screenCoords,
if (sceneryEntry->wall.scrolling_mode != SCROLLING_MODE_NONE)
{
auto banner = tileElement->AsWall()->GetBanner();
if (banner != nullptr)
{
size_t argPos = 0;
set_map_tooltip_format_arg(argPos, rct_string_id, STR_MAP_TOOLTIP_BANNER_STRINGID_STRINGID);
argPos += sizeof(rct_string_id);
argPos += banner->FormatTextTo(gMapTooltipFormatArgs + argPos);
set_map_tooltip_format_arg(argPos, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_MODIFY);
argPos += sizeof(rct_string_id);
set_map_tooltip_format_arg(argPos, rct_string_id, sceneryEntry->name);
return info->type;
}
size_t argPos = 0;
set_map_tooltip_format_arg(argPos, rct_string_id, STR_MAP_TOOLTIP_BANNER_STRINGID_STRINGID);
argPos += sizeof(rct_string_id);
argPos += banner->FormatTextTo(gMapTooltipFormatArgs + argPos);
set_map_tooltip_format_arg(argPos, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_MODIFY);
argPos += sizeof(rct_string_id);
set_map_tooltip_format_arg(argPos, rct_string_id, sceneryEntry->name);
return info->type;
}
break;
@@ -346,17 +344,15 @@ int32_t viewport_interaction_get_item_right(const ScreenCoordsXY& screenCoords,
if (sceneryEntry->large_scenery.scrolling_mode != SCROLLING_MODE_NONE)
{
auto banner = tileElement->AsLargeScenery()->GetBanner();
if (banner != nullptr)
{
size_t argPos = 0;
set_map_tooltip_format_arg(argPos, rct_string_id, STR_MAP_TOOLTIP_BANNER_STRINGID_STRINGID);
argPos += sizeof(rct_string_id);
argPos += banner->FormatTextTo(gMapTooltipFormatArgs + argPos);
set_map_tooltip_format_arg(argPos, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_MODIFY);
argPos += sizeof(rct_string_id);
set_map_tooltip_format_arg(argPos, rct_string_id, sceneryEntry->name);
return info->type;
}
size_t argPos = 0;
set_map_tooltip_format_arg(argPos, rct_string_id, STR_MAP_TOOLTIP_BANNER_STRINGID_STRINGID);
argPos += sizeof(rct_string_id);
argPos += banner->FormatTextTo(gMapTooltipFormatArgs + argPos);
set_map_tooltip_format_arg(argPos, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_MODIFY);
argPos += sizeof(rct_string_id);
set_map_tooltip_format_arg(argPos, rct_string_id, sceneryEntry->name);
return info->type;
}
break;

4
src/openrct2-ui/windows/Sign.cpp
View File

@@ -156,10 +156,8 @@ rct_window* window_sign_open(rct_windownumber number)
window_init_scroll_widgets(w);
auto banner = GetBanner(w->number);
if (banner == nullptr)
return nullptr;
auto signViewPos = banner->position.ToCoordsXY().ToTileCentre();
TileElement* tile_element = map_get_first_element_at(signViewPos);
if (tile_element == nullptr)
return nullptr;