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

[Change] Make town viewport tooltips functionally equivalent to town labels.

Browse Source
This commit is contained in:
RoqueDeicide
2023-07-03 19:14:27 +04:00
parent 5af7be6d17
commit 736c650b6c
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1386,7 +1386,9 @@ STR_FINANCES_REPAY_QUERY_CAPT :{WHITE}Enter th
STR_NEW_LINE :{} STR_NEW_LINE :{}
# Town tooltip # Town tooltip
STR_TOWN_NAME_TOOLTIP :{BLACK}{TOWN} STR_TOWN_NAME_TOOLTIP :{BLACK}{TOWN}{RAW_STRING}
STR_TOWN_NAME_POP_TOOLTIP :{BLACK}{TOWN}: {COMMA}{RAW_STRING}
STR_TOWN_NAME_RATING_TOOLTIP :{}Your rating is {STRING}
STR_INDUSTRY_VIEW_NAME_TOOLTIP :{STRING} STR_INDUSTRY_VIEW_NAME_TOOLTIP :{STRING}
STR_INDUSTRY_VIEW_REQUIRED_TOOLTIP_FIRST :{STRING}{RAW_STRING} STR_INDUSTRY_VIEW_REQUIRED_TOOLTIP_FIRST :{STRING}{RAW_STRING}

35
src/viewport_gui.cpp
View File

@@ -18,6 +18,7 @@
#include "window_func.h" #include "window_func.h"
#include "gfx_func.h" #include "gfx_func.h"
#include "industry.h" #include "industry.h"
#include "town.h"
#include "town_map.h" #include "town_map.h"
#include "widgets/viewport_widget.h" #include "widgets/viewport_widget.h"
@@ -225,12 +226,38 @@ enum TownNameTooltipMode : uint8 {
TNTM_ALWAYS_ON TNTM_ALWAYS_ON
}; };
void ShowTownNameTooltip(Window *w, const TileIndex tile) void ShowTownNameTooltip(Window *w, const TileIndex tile, char *buffer_position, const char *buffer_tail)
{ {
if (_settings_client.gui.town_name_tooltip_mode == TNTM_OFF) return; if (_settings_client.gui.town_name_tooltip_mode == TNTM_OFF) return;
if (HasBit(_display_opt, DO_SHOW_TOWN_NAMES) && _settings_client.gui.town_name_tooltip_mode == TNTM_ON_IF_HIDDEN) return; // No need for a town name tooltip when it is already displayed if (HasBit(_display_opt, DO_SHOW_TOWN_NAMES) && _settings_client.gui.town_name_tooltip_mode == TNTM_ON_IF_HIDDEN) return; // No need for a town name tooltip when it is already displayed
SetDParam(0, GetTownIndex(tile));
GuiShowTooltips(w, STR_TOWN_NAME_TOOLTIP, 0, nullptr, TCC_HOVER_VIEWPORT); StringID tooltip_string = STR_TOWN_NAME_TOOLTIP;
TownID town_id = GetTownIndex(tile);
const Town *town = Town::Get(town_id);
*buffer_position = '\0';
if (_game_mode != GM_EDITOR && _local_company < MAX_COMPANIES && HasBit(town->have_ratings, _local_company)) {
int local_authority_rating_thresholds[] = { RATING_APPALLING, RATING_VERYPOOR, RATING_POOR, RATING_MEDIOCRE, RATING_GOOD, RATING_VERYGOOD,
RATING_EXCELLENT, RATING_OUTSTANDING };
constexpr size_t threshold_count = lengthof(local_authority_rating_thresholds);
auto local_rating = town->ratings[_local_company];
auto rating_string = STR_CARGO_RATING_APPALLING;
for (int i = 0; i < threshold_count && local_rating > local_authority_rating_thresholds[i]; ++i) ++rating_string;
SetDParam(0, rating_string);
GetString(buffer_position, STR_TOWN_NAME_RATING_TOOLTIP, buffer_tail);
}
uint rating_string_parameter_index = 1;
SetDParam(0, town_id);
if (_settings_client.gui.population_in_label) {
tooltip_string = STR_TOWN_NAME_POP_TOOLTIP;
SetDParam(1, town->cache.population);
rating_string_parameter_index = 2;
}
SetDParamStr(rating_string_parameter_index, buffer_position);
GuiShowTooltips(w, tooltip_string, 0, nullptr, TCC_HOVER_VIEWPORT);
} }
bool GetIndustryTooltipString(TileIndex tile, char *buffer_position, const char *buffer_tail); bool GetIndustryTooltipString(TileIndex tile, char *buffer_position, const char *buffer_tail);
@@ -281,7 +308,7 @@ void ShowTooltipForTile(Window *w, const TileIndex tile)
} }
/* FALL THROUGH */ /* FALL THROUGH */
case MP_HOUSE: { case MP_HOUSE: {
ShowTownNameTooltip(w, tile); ShowTownNameTooltip(w, tile, buffer_start, buffer_tail);
break; break;
} }
case MP_INDUSTRY: { case MP_INDUSTRY: {