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

Add sign tooltips to 3d signs

Browse Source 
For some reason, all signs report "Sign" as their text
before actually being modified. This also happens with the
tile inspector, so for now I'm not terribly worried about it
This commit is contained in:
Xkeeper
2019-01-31 14:50:53 -08:00
committed by Aaron van Geffen
parent 877ce58f0b
commit a3106e4c4c
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,8 +317,11 @@ int32_t viewport_interaction_get_item_right(int32_t x, int32_t y, viewport_inter
sceneryEntry = tileElement->AsWall()->GetEntry();
if (sceneryEntry->wall.scrolling_mode != SCROLLING_MODE_NONE)
{
set_map_tooltip_format_arg(0, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_MODIFY);
set_map_tooltip_format_arg(2, rct_string_id, sceneryEntry->name);
banner = &gBanners[tileElement->AsWall()->GetBannerIndex()];
set_map_tooltip_format_arg(0, rct_string_id, STR_MAP_TOOLTIP_BANNER_STRINGID_STRINGID);
set_map_tooltip_format_arg(2, rct_string_id, banner->string_idx);
set_map_tooltip_format_arg(4, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_MODIFY);
set_map_tooltip_format_arg(6, rct_string_id, sceneryEntry->name);
return info->type;
}
break;
@@ -327,8 +330,12 @@ int32_t viewport_interaction_get_item_right(int32_t x, int32_t y, viewport_inter
sceneryEntry = tileElement->AsLargeScenery()->GetEntry();
if (sceneryEntry->large_scenery.scrolling_mode != SCROLLING_MODE_NONE)
{
set_map_tooltip_format_arg(0, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_MODIFY);
set_map_tooltip_format_arg(2, rct_string_id, sceneryEntry->name);
banner = &gBanners[tileElement->AsLargeScenery()->GetBannerIndex()];
set_map_tooltip_format_arg(0, rct_string_id, STR_MAP_TOOLTIP_BANNER_STRINGID_STRINGID);
set_map_tooltip_format_arg(2, rct_string_id, banner->string_idx);
set_map_tooltip_format_arg(4, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_MODIFY);
set_map_tooltip_format_arg(6, rct_string_id, sceneryEntry->name);
return info->type;
}
break;
@@ -337,15 +344,15 @@ int32_t viewport_interaction_get_item_right(int32_t x, int32_t y, viewport_inter
banner = &gBanners[tileElement->AsBanner()->GetIndex()];
sceneryEntry = get_banner_entry(banner->type);
set_map_tooltip_format_arg( 0, rct_string_id, STR_MAP_TOOLTIP_BANNER_STRINGID_STRINGID);
set_map_tooltip_format_arg(0, rct_string_id, STR_MAP_TOOLTIP_BANNER_STRINGID_STRINGID);
if (banner->flags & BANNER_FLAG_NO_ENTRY)
set_map_tooltip_format_arg( 2, rct_string_id, STR_NO_ENTRY);
set_map_tooltip_format_arg(2, rct_string_id, STR_NO_ENTRY);
else
set_map_tooltip_format_arg( 2, rct_string_id, banner->string_idx);
set_map_tooltip_format_arg(2, rct_string_id, banner->string_idx);
set_map_tooltip_format_arg( 4, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_MODIFY);
set_map_tooltip_format_arg( 6, rct_string_id, sceneryEntry->name);
set_map_tooltip_format_arg(4, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_MODIFY);
set_map_tooltip_format_arg(6, rct_string_id, sceneryEntry->name);
return info->type;
}