Mercurial > hg > openttd
changeset 5819:75bda39deacd draft
(svn r8381) -Fix (r8377): [build vehicle window] cleaned up the train refitable detection. It had two variables doing the same thing, but not always set to the same (oops)
| author | bjarni <bjarni@openttd.org> |
|---|---|
| date | Tue, 23 Jan 2007 21:24:26 +0000 |
| parents | 5ed4e35e8161 |
| children | f2218210a022 |
| files | src/build_vehicle_gui.cpp |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -535,12 +535,12 @@ case VEH_Train: { const RailVehicleInfo *rvi = RailVehInfo(engine_number); + refitable = (EngInfo(engine_number)->refit_mask != 0) && (rvi->capacity > 0); + if (rvi->flags & RVI_WAGON) { y = DrawRailWagonPurchaseInfo(x, y, engine_number, rvi); - refitable = true; } else { y = DrawRailEnginePurchaseInfo(x, y, engine_number, rvi, e); - refitable = (rvi->capacity > 0); } /* Cargo type + capacity, or N/A */ @@ -549,11 +549,10 @@ SetDParam(2, STR_EMPTY); } else { int multihead = (rvi->flags & RVI_MULTIHEAD ? 1 : 0); - bool refittable = (EngInfo(engine_number)->refit_mask != 0); SetDParam(0, rvi->cargo_type); SetDParam(1, (rvi->capacity * (CountArticulatedParts(engine_number) + 1)) << multihead); - SetDParam(2, refittable ? STR_9842_REFITTABLE : STR_EMPTY); + SetDParam(2, refitable ? STR_9842_REFITTABLE : STR_EMPTY); } DrawString(x,y, STR_PURCHASE_INFO_CAPACITY, 0); y += 10;