petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Codechange: Pass preformatted string when updating sign positions. (#13480)

Browse Source 
This forces the strings to be formatted in advance and avoids using global string parameters.
This commit is contained in:
Peter Nelson
2025-02-07 13:19:00 +00:00
committed by GitHub
parent eaa765d615
commit 8c48f9fc49
7 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/town_cmd.cpp
View File

@@ -412,11 +412,10 @@ void Town::UpdateVirtCoord()
if (this->cache.sign.kdtree_valid) _viewport_sign_kdtree.Remove(ViewportSignKdtreeItem::MakeTown(this->index));
SetDParam(0, this->index);
SetDParam(1, this->cache.population);
std::string town_string = GetString(STR_TOWN_NAME, this->index);
this->cache.sign.UpdatePosition(pt.x, pt.y - 24 * ZOOM_BASE,
_settings_client.gui.population_in_label ? STR_VIEWPORT_TOWN_POP : STR_TOWN_NAME,
STR_TOWN_NAME);
_settings_client.gui.population_in_label ? GetString(STR_VIEWPORT_TOWN_POP, this->index, this->cache.population) : town_string,
town_string);
_viewport_sign_kdtree.Insert(ViewportSignKdtreeItem::MakeTown(this->index));