diff options
author | rubidium <rubidium@openttd.org> | 2013-11-24 14:46:26 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2013-11-24 14:46:26 +0000 |
commit | 83eeba28b7272a870f777f2f21bfc1def36e873f (patch) | |
tree | 592e23a29d5235307e2984cbd8220d0cd3a1ec76 /src/rail_gui.cpp | |
parent | db894b0b3fa13413cdb76989cfcd2bb789243b77 (diff) | |
download | openttd-83eeba28b7272a870f777f2f21bfc1def36e873f.tar.xz |
(svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns
Diffstat (limited to 'src/rail_gui.cpp')
-rw-r--r-- | src/rail_gui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 5dafb83f8..bac1b3bd1 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1941,9 +1941,9 @@ void InitializeRailGUI() * @param second The railtype to compare. * @return True iff the first should be sorted before the second. */ -static bool CompareRailTypes(const DropDownListItem *first, const DropDownListItem *second) +static CDECL int CompareRailTypes(const DropDownListItem * const *first, const DropDownListItem * const *second) { - return GetRailTypeInfo((RailType)first->result)->sorting_order < GetRailTypeInfo((RailType)second->result)->sorting_order; + return GetRailTypeInfo((RailType)(*first)->result)->sorting_order - GetRailTypeInfo((RailType)(*second)->result)->sorting_order; } /** @@ -1980,8 +1980,8 @@ DropDownList *GetRailTypeDropDownList(bool for_replacement) DropDownListParamStringItem *item = new DropDownListParamStringItem(str, rt, !HasBit(c->avail_railtypes, rt)); item->SetParam(0, rti->strings.menu_text); item->SetParam(1, rti->max_speed); - list->push_back(item); + *list->Append() = item; } - list->sort(CompareRailTypes); + QSortT(list->Begin(), list->Length(), CompareRailTypes); return list; } |