diff options
| author | alberth <alberth@openttd.org> | 2014-09-18 19:53:22 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2014-09-18 19:53:22 +0000 |
| commit | bc84c52b304e07986a04a519f08c0ec7f8179c3a (patch) | |
| tree | bb31f553b56b69a0e10e59f9c45556815d0a594f /src/build_vehicle_gui.cpp | |
| parent | 4ff3ab1357a8d169379fe41e77ae8ae59a539047 (diff) | |
| download | openttd-bc84c52b304e07986a04a519f08c0ec7f8179c3a.tar.xz | |
(svn r26849) -Fix[FS#6113]: Better display of refit information in articulated vehicles.
Diffstat (limited to 'src/build_vehicle_gui.cpp')
| -rw-r--r-- | src/build_vehicle_gui.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index 6c139eb71..bb5c6d6e3 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -532,21 +532,20 @@ static GUIEngineList::FilterFunction * const _filter_funcs[] = { &CargoFilter, }; -static int DrawCargoCapacityInfo(int left, int right, int y, EngineID engine, bool refittable) +static int DrawCargoCapacityInfo(int left, int right, int y, EngineID engine) { - CargoArray cap = GetCapacityOfArticulatedParts(engine); + CargoArray cap; + uint32 refits; + GetArticulatedVehicleCargoesAndRefits(engine, &cap, &refits); for (CargoID c = 0; c < NUM_CARGO; c++) { if (cap[c] == 0) continue; SetDParam(0, c); SetDParam(1, cap[c]); - SetDParam(2, refittable ? STR_PURCHASE_INFO_REFITTABLE : STR_EMPTY); + SetDParam(2, HasBit(refits, c) ? STR_PURCHASE_INFO_REFITTABLE : STR_EMPTY); DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY); y += FONT_HEIGHT_NORMAL; - - /* Only show as refittable once */ - refittable = false; } return y; @@ -831,7 +830,7 @@ int DrawVehiclePurchaseInfo(int left, int right, int y, EngineID engine_number) if (articulated_cargo) { /* Cargo type + capacity, or N/A */ - int new_y = DrawCargoCapacityInfo(left, right, y, engine_number, refittable); + int new_y = DrawCargoCapacityInfo(left, right, y, engine_number); if (new_y == y) { SetDParam(0, CT_INVALID); |