amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-24 12:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: unify documentation and parameter names of sorters

Browse Source
This commit is contained in:
Rubidium
2026-02-11 04:53:39 +01:00
committed by rubidium42
parent 83f58b3fbd
commit 8e75626b49
20 changed files with 116 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/town_gui.cpp
+11 -11
View File
@@ -759,32 +759,32 @@ private:
this->SetWidgetDirty(WID_TD_LIST); // Force repaint of the displayed towns.
}
/** Sort by town name */
static bool TownNameSorter(const Town * const &a, const Town * const &b, const bool &)
/** Sort by town name. @copydoc GUIList::SorterWithFilter */
static bool TownNameSorter(const Town * const &a, const Town * const &b, [[maybe_unused]] const bool &filter)
{
return StrNaturalCompare(a->GetCachedName(), b->GetCachedName()) < 0; // Sort by name (natural sorting).
}
/** Sort by population (default descending, as big towns are of the most interest). */
static bool TownPopulationSorter(const Town * const &a, const Town * const &b, const bool &order)
/** Sort by population (default descending, as big towns are of the most interest). @copydoc GUIList::SorterWithFilter */
static bool TownPopulationSorter(const Town * const &a, const Town * const &b, const bool &filter)
{
uint32_t a_population = a->cache.population;
uint32_t b_population = b->cache.population;
if (a_population == b_population) return TownDirectoryWindow::TownNameSorter(a, b, order);
if (a_population == b_population) return TownDirectoryWindow::TownNameSorter(a, b, filter);
return a_population < b_population;
}
/** Sort by town rating */
static bool TownRatingSorter(const Town * const &a, const Town * const &b, const bool &order)
/** Sort by town rating. @copydoc GUIList::SorterWithFilter */
static bool TownRatingSorter(const Town * const &a, const Town * const &b, const bool &filter)
{
bool before = !order; // Value to get 'a' before 'b'.
bool before = !filter; // Value to get 'a' before 'b'.
/* Towns without rating are always after towns with rating. */
if (a->have_ratings.Test(_local_company)) {
if (b->have_ratings.Test(_local_company)) {
int16_t a_rating = a->ratings[_local_company];
int16_t b_rating = b->ratings[_local_company];
if (a_rating == b_rating) return TownDirectoryWindow::TownNameSorter(a, b, order);
if (a_rating == b_rating) return TownDirectoryWindow::TownNameSorter(a, b, filter);
return a_rating < b_rating;
}
return before;
@@ -792,8 +792,8 @@ private:
if (b->have_ratings.Test(_local_company)) return !before;
/* Sort unrated towns always on ascending town name. */
if (before) return TownDirectoryWindow::TownNameSorter(a, b, order);
return TownDirectoryWindow::TownNameSorter(b, a, order);
if (before) return TownDirectoryWindow::TownNameSorter(a, b, filter);
return TownDirectoryWindow::TownNameSorter(b, a, filter);
}
public: