Changeset - r7087:34eb33fa7a5c
[Not reviewed]
master
0 1 0
rubidium - 17 years ago 2007-06-27 14:37:46
rubidium@openttd.org
(svn r10354) -Fix [FS#950]: loading indicator showed "^" when the train would load at the given station.
1 file changed with 8 insertions and 3 deletions:
0 comments (0 inline, 0 general)
src/vehicle.cpp
Show inline comments
 
@@ -2269,28 +2269,33 @@ bool IsVehicleInDepot(const Vehicle *v)
 
uint8 CalcPercentVehicleFilled(Vehicle *v, StringID *color)
 
{
 
	int count = 0;
 
	int max = 0;
 
	int cars = 0;
 
	int unloading = 0;
 
	bool loading = false;
 

	
 
	assert(color != NULL);
 

	
 
	const Vehicle *u = v;
 
	const Station *st = GetStation(v->last_station_visited);
 

	
 
	/* Count up max and used */
 
	for (; v != NULL; v = v->next) {
 
		count += v->cargo.Count();
 
		max += v->cargo_cap;
 
		if (v->cargo_cap != 0) {
 
			unloading += HASBIT(v->vehicle_flags, VF_CARGO_UNLOADING) ? 1 : 0;
 
			loading |= (u->current_order.flags & OF_UNLOAD) == 0 && st->goods[v->cargo_type].days_since_pickup != 255;
 
			cars++;
 
		}
 
	}
 

	
 
	if (unloading == 0)         *color = STR_PERCENT_UP;
 
	else if (cars == unloading) *color = STR_PERCENT_DOWN;
 
	else                        *color = STR_PERCENT_UP_DOWN;
 
	if (unloading == 0 && loading)          *color = STR_PERCENT_UP;
 
	else if (cars == unloading || !loading) *color = STR_PERCENT_DOWN;
 
	else                                    *color = STR_PERCENT_UP_DOWN;
 

	
 
	/* Train without capacity */
 
	if (max == 0) return 100;
 

	
 
	/* Return the percentage */
 
	return (count * 100) / max;
0 comments (0 inline, 0 general)