dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Link graph: Also show lower of usage/planned in tooltips when ctrl pressed

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-12-02 18:42:07 +00:00
parent 57d4f52c15
commit 7d17c9ba9b
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lang/extra/english.txt
View File

@@ -767,6 +767,8 @@ STR_TRANSPARENT_TUNNELS_TOOLTIP :{BLACK}Toggle t
STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION_GENERAL :{}Average travel time: {STRING1} STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION_GENERAL :{}Average travel time: {STRING1}
STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Capacity: {CARGO_LONG} STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY :{}Capacity: {CARGO_LONG}
STR_LINKGRAPH_STATS_TOOLTIP_USAGE :{}Usage: {CARGO_LONG}
STR_LINKGRAPH_STATS_TOOLTIP_PLANNED :{}Planned: {CARGO_LONG}
STR_LINKGRAPH_STATS_TOOLTIP_DISTANCE :Manhattan Distance: {COMMA} tile{P 0 "" s}{}Bird Fly Distance: {COMMA} tile{P 1 "" s} STR_LINKGRAPH_STATS_TOOLTIP_DISTANCE :Manhattan Distance: {COMMA} tile{P 0 "" s}{}Bird Fly Distance: {COMMA} tile{P 1 "" s}
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_POLYRAIL :{BLACK}Build railway track using the Polyline mode. Ctrl toggles build/remove for railway construction. Shift toggles building/showing cost estimate STR_RAIL_TOOLBAR_TOOLTIP_BUILD_POLYRAIL :{BLACK}Build railway track using the Polyline mode. Ctrl toggles build/remove for railway construction. Shift toggles building/showing cost estimate

28
src/linkgraph/linkgraph_gui.cpp
View File

@@ -518,7 +518,7 @@ bool LinkGraphOverlay::ShowTooltip(Point pt, TooltipCloseCondition close_cond)
pt.y - 2 <= std::max(pta.y, ptb.y) && pt.y - 2 <= std::max(pta.y, ptb.y) &&
check_distance()) { check_distance()) {
static char buf[1024 + 512]; char buf[2048];
char *buf_end = buf; char *buf_end = buf;
buf[0] = 0; buf[0] = 0;
@@ -535,11 +535,24 @@ bool LinkGraphOverlay::ShowTooltip(Point pt, TooltipCloseCondition close_cond)
} }
}; };
if (_ctrl_pressed) { auto add_extra_info = [&](const LinkProperties &info_link) {
SetDParam(0, link.cargo); if (info_link.usage < info_link.planned) {
SetDParam(1, link.capacity); SetDParam(0, info_link.cargo);
SetDParam(1, info_link.usage);
buf_end = GetString(buf_end, STR_LINKGRAPH_STATS_TOOLTIP_USAGE, lastof(buf));
} else if (info_link.planned < info_link.usage) {
SetDParam(0, info_link.cargo);
SetDParam(1, info_link.planned);
buf_end = GetString(buf_end, STR_LINKGRAPH_STATS_TOOLTIP_PLANNED, lastof(buf));
}
SetDParam(0, info_link.cargo);
SetDParam(1, info_link.capacity);
buf_end = GetString(buf_end, STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY, lastof(buf)); buf_end = GetString(buf_end, STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY, lastof(buf));
add_travel_time(link.time); add_travel_time(info_link.time);
};
if (_ctrl_pressed) {
add_extra_info(link);
} }
/* Fill buf with more information if this is a bidirectional link. */ /* Fill buf with more information if this is a bidirectional link. */
@@ -554,10 +567,7 @@ bool LinkGraphOverlay::ShowTooltip(Point pt, TooltipCloseCondition close_cond)
SetDParam(2, j->prop.Usage() * 100 / (j->prop.capacity + 1)); SetDParam(2, j->prop.Usage() * 100 / (j->prop.capacity + 1));
buf_end = GetString(buf_end, STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION, lastof(buf)); buf_end = GetString(buf_end, STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION, lastof(buf));
if (_ctrl_pressed) { if (_ctrl_pressed) {
SetDParam(0, j->prop.cargo); add_extra_info(j->prop);
SetDParam(1, j->prop.capacity);
buf_end = GetString(buf_end, STR_LINKGRAPH_STATS_TOOLTIP_CAPACITY, lastof(buf));
add_travel_time(back_time);
} }
} }
break; break;