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

Merge branch 'departure-boards' into jgrpp

Browse Source 
VehicleListIdentifier API changes.

# Conflicts:
#	src/departures.cpp
#	src/vehicle_gui.cpp
This commit is contained in:
Jonathan G Rennison
2016-11-11 18:46:15 +00:00
parent 1cede8431f 31b2a39d02
commit 10ae23d3b9
18 changed files with 96 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vehicle_gui_base.h
View File

@@ -41,7 +41,7 @@ struct BaseVehicleListWindow : public Window {
static const StringID vehicle_sorter_names[];
static GUIVehicleList::SortFunction * const vehicle_sorter_funcs[];
BaseVehicleListWindow(WindowDesc *desc, WindowNumber wno) : Window(desc), vli(wno)
BaseVehicleListWindow(WindowDesc *desc, WindowNumber wno) : Window(desc), vli(VehicleListIdentifier::UnPack(wno))
{
this->vehicles.SetSortFuncs(this->vehicle_sorter_funcs);
}