mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r25405) -Feature-ish: differentiate between total waiting cargo count and available (not reserved) cargo count in the station list 

-Change: sort based on the cargo count, not the cargo value
release/1.4
rubidium 2013-06-15 15:26:24 +00:00
parent 2ef4438882
commit 420f95a6e9
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lang/english.txt
View File

@ -278,7 +278,8 @@ STR_SORT_BY_LENGTH :Length
STR_SORT_BY_LIFE_TIME :Remaining lifetime STR_SORT_BY_LIFE_TIME :Remaining lifetime
STR_SORT_BY_TIMETABLE_DELAY :Timetable delay STR_SORT_BY_TIMETABLE_DELAY :Timetable delay
STR_SORT_BY_FACILITY :Station type STR_SORT_BY_FACILITY :Station type
STR_SORT_BY_WAITING :Waiting cargo value STR_SORT_BY_WAITING_TOTAL :Total waiting cargo
STR_SORT_BY_WAITING_AVAILABLE :Available waiting cargo
STR_SORT_BY_RATING_MAX :Highest cargo rating STR_SORT_BY_RATING_MAX :Highest cargo rating
STR_SORT_BY_RATING_MIN :Lowest cargo rating STR_SORT_BY_RATING_MIN :Lowest cargo rating
STR_SORT_BY_ENGINE_ID :EngineID (classic sort) STR_SORT_BY_ENGINE_ID :EngineID (classic sort)

28
src/station_gui.cpp
View File

@ -229,17 +229,29 @@ protected:
} }
/** Sort stations by their waiting cargo */ /** Sort stations by their waiting cargo */
static int CDECL StationWaitingSorter(const Station * const *a, const Station * const *b) static int CDECL StationWaitingTotalSorter(const Station * const *a, const Station * const *b)
{ {
Money diff = 0; int diff = 0;
CargoID j; CargoID j;
FOR_EACH_SET_CARGO_ID(j, cargo_filter) { FOR_EACH_SET_CARGO_ID(j, cargo_filter) {
if ((*a)->goods[j].cargo.TotalCount() > 0) diff += GetTransportedGoodsIncome((*a)->goods[j].cargo.TotalCount(), 20, 50, j); diff += (*a)->goods[j].cargo.TotalCount() - (*b)->goods[j].cargo.TotalCount();
if ((*b)->goods[j].cargo.TotalCount() > 0) diff -= GetTransportedGoodsIncome((*b)->goods[j].cargo.TotalCount(), 20, 50, j);
} }
return ClampToI32(diff); return diff;
}
/** Sort stations by their available waiting cargo */
static int CDECL StationWaitingAvailableSorter(const Station * const *a, const Station * const *b)
{
int diff = 0;
CargoID j;
FOR_EACH_SET_CARGO_ID(j, cargo_filter) {
diff += (*a)->goods[j].cargo.AvailableCount() - (*b)->goods[j].cargo.AvailableCount();
}
return diff;
} }
/** Sort stations by their rating */ /** Sort stations by their rating */
@ -644,7 +656,8 @@ const Station *CompanyStationsWindow::last_station = NULL;
GUIStationList::SortFunction * const CompanyStationsWindow::sorter_funcs[] = { GUIStationList::SortFunction * const CompanyStationsWindow::sorter_funcs[] = {
&StationNameSorter, &StationNameSorter,
&StationTypeSorter, &StationTypeSorter,
&StationWaitingSorter, &StationWaitingTotalSorter,
&StationWaitingAvailableSorter,
&StationRatingMaxSorter, &StationRatingMaxSorter,
&StationRatingMinSorter &StationRatingMinSorter
}; };
@ -653,7 +666,8 @@ GUIStationList::SortFunction * const CompanyStationsWindow::sorter_funcs[] = {
const StringID CompanyStationsWindow::sorter_names[] = { const StringID CompanyStationsWindow::sorter_names[] = {
STR_SORT_BY_NAME, STR_SORT_BY_NAME,
STR_SORT_BY_FACILITY, STR_SORT_BY_FACILITY,
STR_SORT_BY_WAITING, STR_SORT_BY_WAITING_TOTAL,
STR_SORT_BY_WAITING_AVAILABLE,
STR_SORT_BY_RATING_MAX, STR_SORT_BY_RATING_MAX,
STR_SORT_BY_RATING_MIN, STR_SORT_BY_RATING_MIN,
INVALID_STRING_ID INVALID_STRING_ID