diff options
| author | rubidium <rubidium@openttd.org> | 2009-10-27 19:56:00 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-10-27 19:56:00 +0000 |
| commit | 955f48e0ac3e974b23f22c2d7505ee6666dbdebb (patch) | |
| tree | d32e80f10469db44d52fb0e517ac37a37a8ec045 /src | |
| parent | 2ef0746007bc4b60e885db4ef0cf9ab7615be7b7 (diff) | |
| download | openttd-955f48e0ac3e974b23f22c2d7505ee6666dbdebb.tar.xz | |
(svn r17891) -Feature [FS#1619]: Show maximum tractive effort in the 'exclusive test'/'early offer'/'engine preview' window
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine_gui.cpp | 4 | ||||
| -rw-r--r-- | src/lang/english.txt | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp index 38a4dfa8e..280513063 100644 --- a/src/engine_gui.cpp +++ b/src/engine_gui.cpp @@ -21,6 +21,7 @@ #include "vehicle_func.h" #include "company_func.h" #include "rail.h" +#include "settings_type.h" #include "table/strings.h" @@ -140,6 +141,7 @@ static StringID GetTrainEngineInfoString(const Engine *e) SetDParam(2, e->GetDisplayMaxSpeed()); SetDParam(3, e->GetPower()); SetDParam(1, e->GetDisplayWeight()); + SetDParam(7, e->GetDisplayMaxTractiveEffort()); SetDParam(4, e->GetRunningCost()); @@ -150,7 +152,7 @@ static StringID GetTrainEngineInfoString(const Engine *e) } else { SetDParam(5, CT_INVALID); } - return STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER; + 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; } static StringID GetAircraftEngineInfoString(const Engine *e) diff --git a/src/lang/english.txt b/src/lang/english.txt index 833652337..9933d8e2b 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2784,6 +2784,7 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE :monorail locomo STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE :maglev locomotive STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER :{BLACK}Cost: {CURRENCY} Weight: {WEIGHT_S}{}Speed: {VELOCITY} Power: {POWER}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO} +STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}Cost: {CURRENCY} Weight: {WEIGHT_S}{}Speed: {VELOCITY} Power: {POWER} Max. T.E.: {7:FORCE}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO} STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {CARGO}, {CARGO}{}Running Cost: {CURRENCY}/yr STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {CARGO}{}Running Cost: {CURRENCY}/yr |