diff options
author | frosch <frosch@openttd.org> | 2015-10-30 17:24:30 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2015-10-30 17:24:30 +0000 |
commit | 2d636266f59e8f5e88c3460b9adb8889442108d8 (patch) | |
tree | 2ce70a31ab745556593c46cb72d5c2341b34cc69 /src/rail_gui.cpp | |
parent | 312809228d52009191e2000cc1a49272b48f9699 (diff) | |
download | openttd-2d636266f59e8f5e88c3460b9adb8889442108d8.tar.xz |
(svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window.
Diffstat (limited to 'src/rail_gui.cpp')
-rw-r--r-- | src/rail_gui.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index a8c2fc6b3..a48abd29c 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1979,17 +1979,6 @@ void InitializeRailGUI() } /** - * Compare railtypes based on their sorting order. - * @param first The railtype to compare to. - * @param second The railtype to compare. - * @return True iff the first should be sorted before the second. - */ -static int CDECL CompareRailTypes(const DropDownListItem * const *first, const DropDownListItem * const *second) -{ - return GetRailTypeInfo((RailType)(*first)->result)->sorting_order - GetRailTypeInfo((RailType)(*second)->result)->sorting_order; -} - -/** * Create a drop down list for all the rail types of the local company. * @param for_replacement Whether this list is for the replacement window. * @return The populated and sorted #DropDownList. @@ -2011,13 +2000,12 @@ DropDownList *GetRailTypeDropDownList(bool for_replacement) const Company *c = Company::Get(_local_company); DropDownList *list = new DropDownList(); - for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) { + RailType rt; + FOR_ALL_SORTED_RAILTYPES(rt) { /* If it's not used ever, don't show it to the user. */ if (!HasBit(used_railtypes, rt)) continue; const RailtypeInfo *rti = GetRailTypeInfo(rt); - /* Skip rail type if it has no label */ - if (rti->label == 0) continue; StringID str = for_replacement ? rti->strings.replace_text : (rti->max_speed > 0 ? STR_TOOLBAR_RAILTYPE_VELOCITY : STR_JUST_STRING); DropDownListParamStringItem *item = new DropDownListParamStringItem(str, rt, !HasBit(c->avail_railtypes, rt)); @@ -2025,6 +2013,5 @@ DropDownList *GetRailTypeDropDownList(bool for_replacement) item->SetParam(1, rti->max_speed); *list->Append() = item; } - QSortT(list->Begin(), list->Length(), CompareRailTypes); return list; } |