miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add real population to town directory, sortable

Browse Source
This commit is contained in:
Pavel Stupnikov
2016-03-06 17:47:55 +03:00
parent e7cd523975
commit 45eb2e7ea1
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/lang/english.txt
View File

@@ -5180,12 +5180,13 @@ STR_TOOLBAR_CARGOS_CAPTION :{WHITE}{COMPANY
STR_TOOLBAR_CARGOS_NAME :{BLACK}{STRING} STR_TOOLBAR_CARGOS_NAME :{BLACK}{STRING}
#towns #towns
STR_TOWN_DIRECTORY_TOWN_COLOUR :{ORANGE}{TOWN}{BLACK} ({COMMA}) {YELLOW}{COMMA} {P "house" "houses"} STR_TOWN_DIRECTORY_TOWN_COLOUR :{ORANGE}{TOWN}{BLACK} ({COMMA}->{COMMA}) {YELLOW}{COMMA} {P "house" "houses"}
STR_TOWN_DIRECTORY_CITY_COLOUR :{YELLOW}{TOWN}{BLACK} ({COMMA}) {YELLOW}{COMMA} {P "house" "houses"} STR_TOWN_DIRECTORY_CITY_COLOUR :{YELLOW}{TOWN}{BLACK} ({COMMA}->{COMMA}) {YELLOW}{COMMA} {P "house" "houses"}
STR_OLD_DEPOT_TRAINT_LENGTH :Old depot length format: {STRING2} STR_OLD_DEPOT_TRAINT_LENGTH :Old depot length format: {STRING2}
STR_SMALLMAP_TOWN_LARGE :{TINY_FONT}{YELLOW}{TOWN} STR_SMALLMAP_TOWN_LARGE :{TINY_FONT}{YELLOW}{TOWN}
STR_SORT_BY_HOUSES :Houses STR_SORT_BY_HOUSES :Houses
STR_SORT_BY_REAL_POPULATION :Real population
STR_ORDER_DIST :{NUM}, {NUM} STR_ORDER_DIST :{NUM}, {NUM}
#server list #server list

14
src/town_gui.cpp
View File

@@ -787,6 +787,15 @@ private:
return (a_population < b_population) ? -1 : 1; return (a_population < b_population) ? -1 : 1;
} }
/** Sort by real population (default descending, as big towns are of the most interest). */
static int CDECL TownRealPopulationSorter(const Town * const *a, const Town * const *b)
{
uint32 a_population = (*a)->cache.potential_pop;
uint32 b_population = (*b)->cache.potential_pop;
if (a_population == b_population) return TownDirectoryWindow::TownNameSorter(a, b);
return (a_population < b_population) ? -1 : 1;
}
/** Sort by number of houses (default descending, as big towns are of the most interest). */ /** Sort by number of houses (default descending, as big towns are of the most interest). */
static int CDECL TownHousesSorter(const Town * const *a, const Town * const *b) static int CDECL TownHousesSorter(const Town * const *a, const Town * const *b)
{ {
@@ -893,7 +902,8 @@ public:
SetDParam(0, t->index); SetDParam(0, t->index);
SetDParam(1, t->cache.population); SetDParam(1, t->cache.population);
SetDParam(2, t->cache.num_houses); SetDParam(2, t->cache.potential_pop);
SetDParam(3, t->cache.num_houses);
/* CITIES DIFFERENT COLOUR*/ /* CITIES DIFFERENT COLOUR*/
DrawString(text_left, text_right, y + (this->resize.step_height - FONT_HEIGHT_NORMAL) / 2, t->larger_town ? STR_TOWN_DIRECTORY_CITY_COLOUR : STR_TOWN_DIRECTORY_TOWN_COLOUR); DrawString(text_left, text_right, y + (this->resize.step_height - FONT_HEIGHT_NORMAL) / 2, t->larger_town ? STR_TOWN_DIRECTORY_CITY_COLOUR : STR_TOWN_DIRECTORY_TOWN_COLOUR);
@@ -1046,6 +1056,7 @@ const Town *TownDirectoryWindow::last_town = NULL;
const StringID TownDirectoryWindow::sorter_names[] = { const StringID TownDirectoryWindow::sorter_names[] = {
STR_SORT_BY_NAME, STR_SORT_BY_NAME,
STR_SORT_BY_POPULATION, STR_SORT_BY_POPULATION,
STR_SORT_BY_REAL_POPULATION,
STR_SORT_BY_HOUSES, STR_SORT_BY_HOUSES,
STR_SORT_BY_RATING, STR_SORT_BY_RATING,
INVALID_STRING_ID INVALID_STRING_ID
@@ -1055,6 +1066,7 @@ const StringID TownDirectoryWindow::sorter_names[] = {
GUITownList::SortFunction * const TownDirectoryWindow::sorter_funcs[] = { GUITownList::SortFunction * const TownDirectoryWindow::sorter_funcs[] = {
&TownNameSorter, &TownNameSorter,
&TownPopulationSorter, &TownPopulationSorter,
&TownRealPopulationSorter,
&TownHousesSorter, &TownHousesSorter,
&TownRatingSorter, &TownRatingSorter,
}; };