Mercurial > hg > openttd
changeset 11717:eabd34568e65 draft
(svn r16105) -Codechange: use {CARGO} instead hardcoded cargo name
| author | glx <glx@openttd.org> |
|---|---|
| date | Mon, 20 Apr 2009 22:41:09 +0000 |
| parents | deffca83aa7e |
| children | 411b82321c8c |
| files | src/engine_gui.cpp src/lang/english.txt |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/engine_gui.cpp +++ b/src/engine_gui.cpp @@ -174,9 +174,11 @@ 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 {
--- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2806,7 +2806,7 @@ 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}