mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(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)

release/0.6
bjarni 2007-01-23 21:24:26 +00:00
parent d2ca1494be
commit a73f67af40
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/build_vehicle_gui.cpp
View File

@ -535,12 +535,12 @@ void DrawVehiclePurchaseInfo(int x, int y, uint w, EngineID engine_number)
case VEH_Train: { case VEH_Train: {
const RailVehicleInfo *rvi = RailVehInfo(engine_number); const RailVehicleInfo *rvi = RailVehInfo(engine_number);
refitable = (EngInfo(engine_number)->refit_mask != 0) && (rvi->capacity > 0);
if (rvi->flags & RVI_WAGON) { if (rvi->flags & RVI_WAGON) {
y = DrawRailWagonPurchaseInfo(x, y, engine_number, rvi); y = DrawRailWagonPurchaseInfo(x, y, engine_number, rvi);
refitable = true;
} else { } else {
y = DrawRailEnginePurchaseInfo(x, y, engine_number, rvi, e); y = DrawRailEnginePurchaseInfo(x, y, engine_number, rvi, e);
refitable = (rvi->capacity > 0);
} }
/* Cargo type + capacity, or N/A */ /* Cargo type + capacity, or N/A */
@ -549,11 +549,10 @@ void DrawVehiclePurchaseInfo(int x, int y, uint w, EngineID engine_number)
SetDParam(2, STR_EMPTY); SetDParam(2, STR_EMPTY);
} else { } else {
int multihead = (rvi->flags & RVI_MULTIHEAD ? 1 : 0); int multihead = (rvi->flags & RVI_MULTIHEAD ? 1 : 0);
bool refittable = (EngInfo(engine_number)->refit_mask != 0);
SetDParam(0, rvi->cargo_type); SetDParam(0, rvi->cargo_type);
SetDParam(1, (rvi->capacity * (CountArticulatedParts(engine_number) + 1)) << multihead); 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); DrawString(x,y, STR_PURCHASE_INFO_CAPACITY, 0);
y += 10; y += 10;