diff options
| author | glx <glx@openttd.org> | 2009-04-20 22:41:09 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2009-04-20 22:41:09 +0000 |
| commit | 37cce7098b93bc4e0a8581aad6dd5f8f09fe36e0 (patch) | |
| tree | e33c9febb7a418dc5cbe6bdee00f8b19650284db | |
| parent | b01ed2b38f0e8396e899b150ae87ec9a1e8d2526 (diff) | |
| download | openttd-37cce7098b93bc4e0a8581aad6dd5f8f09fe36e0.tar.xz | |
(svn r16105) -Codechange: use {CARGO} instead hardcoded cargo name
| -rw-r--r-- | src/engine_gui.cpp | 8 | ||||
| -rw-r--r-- | src/lang/english.txt | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp index 03848f053..40b4f2d98 100644 --- a/src/engine_gui.cpp +++ b/src/engine_gui.cpp @@ -174,9 +174,11 @@ static void DrawAircraftEngineInfo(EngineID engine, int left, int right, int top if (cargo == CT_INVALID || cargo == CT_PASSENGERS) { SetDParam(0, e->GetCost()); SetDParam(1, e->GetDisplayMaxSpeed()); - SetDParam(2, e->GetDisplayDefaultCapacity()); - SetDParam(3, e->u.air.mail_capacity); - SetDParam(4, e->GetRunningCost()); + SetDParam(2, CT_PASSENGERS), + SetDParam(3, e->GetDisplayDefaultCapacity()); + SetDParam(4, CT_MAIL), + SetDParam(5, e->u.air.mail_capacity); + SetDParam(6, e->GetRunningCost()); DrawStringMultiLine(left, right, top, bottom, STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST, SA_CENTER); } else { diff --git a/src/lang/english.txt b/src/lang/english.txt index da1664a0f..9317c9109 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2806,7 +2806,7 @@ STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Clear th STR_TIMETABLE_RESET_LATENESS_TOOLTIP :{BLACK}Reset the lateness counter, so the vehicle will be on time STR_SERVICE_HINT :{BLACK}Skip this order unless a service is needed STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}Cost: {CURRENCY} Weight: {WEIGHT_S}{}Speed: {VELOCITY} Power: {POWER}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO} -STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {COMMA} passengers, {COMMA} bags of mail{}Running Cost: {CURRENCY}/yr +STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {CARGO}, {CARGO}{}Running Cost: {CURRENCY}/yr STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {CARGO}{}Running Cost: {CURRENCY}/yr STR_VEHICLE_INFO_AGE_RUNNING_COST_YR :{BLACK}Age: {LTBLUE}{STRING2}{BLACK} Running Cost: {LTBLUE}{CURRENCY}/yr STR_VEHICLE_INFO_MAX_SPEED :{BLACK}Max. speed: {LTBLUE}{VELOCITY} |