|
@@ -383,13 +383,13 @@ static int DrawRailWagonPurchaseInfo(int
|
|
|
DrawString(x, y, STR_PURCHASE_INFO_COST, 0);
|
|
|
y += 10;
|
|
|
|
|
|
/* Wagon weight - (including cargo) */
|
|
|
uint weight = GetEngineProperty(engine_number, 0x16, rvi->weight);
|
|
|
SetDParam(0, weight);
|
|
|
SetDParam(1, (GetCargo(rvi->cargo_type)->weight * rvi->capacity >> 4) + weight);
|
|
|
SetDParam(1, (GetCargo(rvi->cargo_type)->weight * GetEngineProperty(engine_number, 0x14, rvi->capacity) >> 4) + weight);
|
|
|
DrawString(x, y, STR_PURCHASE_INFO_WEIGHT_CWEIGHT, 0);
|
|
|
y += 10;
|
|
|
|
|
|
/* Wagon speed limit, displayed if above zero */
|
|
|
if (_patches.wagon_speed_limits) {
|
|
|
uint max_speed = GetEngineProperty(engine_number, 0x09, rvi->max_speed);
|
|
@@ -458,13 +458,13 @@ static int DrawRoadVehPurchaseInfo(int x
|
|
|
SetDParam(0, rvi->running_cost * _price.roadveh_running >> 8);
|
|
|
DrawString(x, y, STR_PURCHASE_INFO_RUNNINGCOST, 0);
|
|
|
y += 10;
|
|
|
|
|
|
/* Cargo type + capacity */
|
|
|
SetDParam(0, rvi->cargo_type);
|
|
|
SetDParam(1, rvi->capacity);
|
|
|
SetDParam(1, GetEngineProperty(engine_number, 0x0F, rvi->capacity));
|
|
|
SetDParam(2, refittable ? STR_9842_REFITTABLE : STR_EMPTY);
|
|
|
DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, 0);
|
|
|
y += 10;
|
|
|
|
|
|
return y;
|
|
|
}
|
|
@@ -477,13 +477,13 @@ static int DrawShipPurchaseInfo(int x, i
|
|
|
SetDParam(1, GetEngineProperty(engine_number, 0x0B, svi->max_speed) * 10 / 32);
|
|
|
DrawString(x, y, STR_PURCHASE_INFO_COST_SPEED, 0);
|
|
|
y += 10;
|
|
|
|
|
|
/* Cargo type + capacity */
|
|
|
SetDParam(0, svi->cargo_type);
|
|
|
SetDParam(1, svi->capacity);
|
|
|
SetDParam(1, GetEngineProperty(engine_number, 0x0D, svi->capacity));
|
|
|
SetDParam(2, svi->refittable ? STR_9842_REFITTABLE : STR_EMPTY);
|
|
|
DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, 0);
|
|
|
y += 10;
|
|
|
|
|
|
/* Running cost */
|
|
|
SetDParam(0, GetEngineProperty(engine_number, 0x0F, svi->running_cost) * _price.ship_running >> 8);
|
|
@@ -542,14 +542,15 @@ int DrawVehiclePurchaseInfo(int x, int y
|
|
|
ConvertDateToYMD(e->intro_date, &ymd);
|
|
|
bool refitable = false;
|
|
|
|
|
|
switch (e->type) {
|
|
|
case VEH_TRAIN: {
|
|
|
const RailVehicleInfo *rvi = RailVehInfo(engine_number);
|
|
|
uint capacity = GetEngineProperty(engine_number, 0x14, rvi->capacity);
|
|
|
|
|
|
refitable = (EngInfo(engine_number)->refit_mask != 0) && (rvi->capacity > 0);
|
|
|
refitable = (EngInfo(engine_number)->refit_mask != 0) && (capacity > 0);
|
|
|
|
|
|
if (rvi->railveh_type == RAILVEH_WAGON) {
|
|
|
y = DrawRailWagonPurchaseInfo(x, y, engine_number, rvi);
|
|
|
} else {
|
|
|
y = DrawRailEnginePurchaseInfo(x, y, engine_number, rvi);
|
|
|
}
|
|
@@ -559,13 +560,13 @@ int DrawVehiclePurchaseInfo(int x, int y
|
|
|
SetDParam(0, CT_INVALID);
|
|
|
SetDParam(2, STR_EMPTY);
|
|
|
} else {
|
|
|
int multihead = (rvi->railveh_type == RAILVEH_MULTIHEAD ? 1 : 0);
|
|
|
|
|
|
SetDParam(0, rvi->cargo_type);
|
|
|
SetDParam(1, (rvi->capacity * (CountArticulatedParts(engine_number) + 1)) << multihead);
|
|
|
SetDParam(1, (capacity * (CountArticulatedParts(engine_number) + 1)) << multihead);
|
|
|
SetDParam(2, refitable ? STR_9842_REFITTABLE : STR_EMPTY);
|
|
|
}
|
|
|
DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, 0);
|
|
|
y += 10;
|
|
|
}
|
|
|
break;
|