From b2292122b660372f253a8e0813e24366cbd049dc Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 6 Apr 2013 12:10:16 +0000 Subject: (svn r25149) -Codechange: replace 'magic' 'has rating' bitcheck by descriptive function --- src/vehicle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/vehicle.cpp') diff --git a/src/vehicle.cpp b/src/vehicle.cpp index b15d3c608..caadbf49d 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1261,7 +1261,7 @@ uint8 CalcPercentVehicleFilled(const Vehicle *front, StringID *colour) if (v->cargo_cap != 0 && colour != NULL) { unloading += HasBit(v->vehicle_flags, VF_CARGO_UNLOADING) ? 1 : 0; loading |= !order_no_load && - (order_full_load || HasBit(st->goods[v->cargo_type].acceptance_pickup, GoodsEntry::GES_PICKUP)) && + (order_full_load || st->goods[v->cargo_type].HasRating()) && !HasBit(v->vehicle_flags, VF_LOADING_FINISHED) && !HasBit(v->vehicle_flags, VF_STOP_LOADING); cars++; } -- cgit v1.2.3-54-g00ecf