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

Merge branch 'save_ext' into departure-boards

Browse Source 
Adjust calls to GenerateVehicleSortList due to API change.
This commit is contained in:
Jonathan G Rennison
2016-11-11 18:37:52 +00:00
parent d226495d3b dbd99707b6
commit 31b2a39d02
259 changed files with 11408 additions and 3468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/departures_gui.cpp
View File

@@ -407,7 +407,7 @@ uint DeparturesWindow<Twaypoint>::GetMinWidth() const
VehicleList vehicles;
/* MAX_COMPANIES is probably the wrong thing to put here, but it works. GenerateVehicleSortList doesn't check the company when the type of list is VL_STATION_LIST (r20801). */
if (!GenerateVehicleSortList(&vehicles, VehicleListIdentifier(VL_STATION_LIST, (VehicleType)(VEH_TRAIN + i), MAX_COMPANIES, station).Pack())) {
if (!GenerateVehicleSortList(&vehicles, VehicleListIdentifier(VL_STATION_LIST, (VehicleType)(VEH_TRAIN + i), MAX_COMPANIES, station))) {
/* Something went wrong: panic! */
continue;
}
@@ -540,7 +540,7 @@ void DeparturesWindow<Twaypoint>::DrawDeparturesListItems(const Rect &r) const
VehicleList vehicles;
/* MAX_COMPANIES is probably the wrong thing to put here, but it works. GenerateVehicleSortList doesn't check the company when the type of list is VL_STATION_LIST (r20801). */
if (!GenerateVehicleSortList(&vehicles, VehicleListIdentifier(VL_STATION_LIST, (VehicleType)(VEH_TRAIN + i), MAX_COMPANIES, station).Pack())) {
if (!GenerateVehicleSortList(&vehicles, VehicleListIdentifier(VL_STATION_LIST, (VehicleType)(VEH_TRAIN + i), MAX_COMPANIES, station))) {
/* Something went wrong: panic! */
continue;
}