dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns

Browse Source
This commit is contained in:
rubidium
2013-11-24 14:46:26 +00:00
parent db894b0b3f
commit 83eeba28b7
15 changed files with 115 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/rail_gui.cpp
View File

@@ -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;
}