cpp/openttd-patchpack/source Changeset - r13372:236fb191f6c2

Changeset - r13372:236fb191f6c2

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 15 years ago 2009-10-27 19:56:00
rubidium@openttd.org

(svn r17891) -Feature [FS#1619]: Show maximum tractive effort in the 'exclusive test'/'early offer'/'engine preview' window

2 files changed with 4 insertions and 1 deletions:

src/engine_gui.cpp

src/lang/english.txt

0 comments (0 inline, 0 general)

src/engine_gui.cpp

➞

Show inline comments

@@ @@ -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 @@
 	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 @@
 	} 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)

src/lang/english.txt

➞

Show inline comments

@@ @@ -2784,6 +2784,7 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE @@
 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

0 comments (0 inline, 0 general)