mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r20581) -Codechange: simplify getting the station in CalcPercentVehicleFilled

This commit is contained in:
rubidium 2010-08-20 15:35:14 +00:00
parent f3864181b6
commit d6cd62e633
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vehicle.cpp
View File

@ -1038,7 +1038,9 @@ uint8 CalcPercentVehicleFilled(const Vehicle *v, StringID *colour)
bool loading = false;
const Vehicle *u = v;
const Station *st = v->last_station_visited != INVALID_STATION ? Station::Get(v->last_station_visited) : NULL;
/* The station may be NULL when the (colour) string does not need to be set. */
const Station *st = Station::GetIfValid(v->last_station_visited);
assert(colour == NULL || st != NULL);
/* Count up max and used */
for (; v != NULL; v = v->Next()) {