mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r12664) -Codechange: do not force the 'color' pointer to be non-NULL when trying to get the load percentage.
This commit is contained in:
parent
00d23c57b3
commit
8226c92c8a
|
@ -2149,8 +2149,6 @@ uint8 CalcPercentVehicleFilled(Vehicle *v, StringID *color)
|
||||||
int unloading = 0;
|
int unloading = 0;
|
||||||
bool loading = false;
|
bool loading = false;
|
||||||
|
|
||||||
assert(color != NULL);
|
|
||||||
|
|
||||||
const Vehicle *u = v;
|
const Vehicle *u = v;
|
||||||
const Station *st = GetStation(v->last_station_visited);
|
const Station *st = GetStation(v->last_station_visited);
|
||||||
|
|
||||||
|
@ -2165,12 +2163,14 @@ uint8 CalcPercentVehicleFilled(Vehicle *v, StringID *color)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (unloading == 0 && loading) {
|
if (color != NULL) {
|
||||||
*color = STR_PERCENT_UP;
|
if (unloading == 0 && loading) {
|
||||||
} else if (cars == unloading || !loading) {
|
*color = STR_PERCENT_UP;
|
||||||
*color = STR_PERCENT_DOWN;
|
} else if (cars == unloading || !loading) {
|
||||||
} else {
|
*color = STR_PERCENT_DOWN;
|
||||||
*color = STR_PERCENT_UP_DOWN;
|
} else {
|
||||||
|
*color = STR_PERCENT_UP_DOWN;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Train without capacity */
|
/* Train without capacity */
|
||||||
|
|
Loading…
Reference in New Issue