mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r18818) -Fix [FS#3526] (r18766): some train acceleration type conversions were missed
This commit is contained in:
parent
31d1e9c051
commit
879668811c
|
@ -479,7 +479,7 @@ static int DrawRailEnginePurchaseInfo(int left, int right, int y, EngineID engin
|
|||
y += FONT_HEIGHT_NORMAL;
|
||||
|
||||
/* Max tractive effort - not applicable if old acceleration or maglev */
|
||||
if (_settings_game.vehicle.train_acceleration_model != TAM_ORIGINAL && rvi->railtype != RAILTYPE_MAGLEV) {
|
||||
if (_settings_game.vehicle.train_acceleration_model != TAM_ORIGINAL && GetRailTypeInfo(rvi->railtype)->acceleration_type != 2) {
|
||||
SetDParam(0, e->GetDisplayMaxTractiveEffort());
|
||||
DrawString(left, right, y, STR_PURCHASE_INFO_MAX_TE);
|
||||
y += FONT_HEIGHT_NORMAL;
|
||||
|
|
|
@ -161,7 +161,7 @@ static StringID GetTrainEngineInfoString(const Engine *e)
|
|||
} else {
|
||||
SetDParam(5, CT_INVALID);
|
||||
}
|
||||
return (_settings_game.vehicle.train_acceleration_model != TAM_ORIGINAL && e->u.rail.railtype != RAILTYPE_MAGLEV) ? STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE : STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER;
|
||||
return (_settings_game.vehicle.train_acceleration_model != TAM_ORIGINAL && GetRailTypeInfo(e->u.rail.railtype)->acceleration_type != 2) ? STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE : STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER;
|
||||
}
|
||||
|
||||
static StringID GetAircraftEngineInfoString(const Engine *e)
|
||||
|
|
|
@ -1532,7 +1532,7 @@ struct VehicleDetailsWindow : Window {
|
|||
SetDParam(1, Train::From(v)->tcache.cached_power);
|
||||
SetDParam(0, Train::From(v)->tcache.cached_weight);
|
||||
SetDParam(3, Train::From(v)->tcache.cached_max_te / 1000);
|
||||
DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, (_settings_game.vehicle.train_acceleration_model != TAM_ORIGINAL && Train::From(v)->railtype != RAILTYPE_MAGLEV) ?
|
||||
DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, (_settings_game.vehicle.train_acceleration_model != TAM_ORIGINAL && GetRailTypeInfo(Train::From(v)->railtype)->acceleration_type != 2) ?
|
||||
STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE : STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED);
|
||||
break;
|
||||
|
||||
|
|
Loading…
Reference in New Issue