dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved breakdowns: Fix string parameter count issues.

Browse Source 
Fix whitespace.
This commit is contained in:
Jonathan G Rennison
2016-01-31 23:24:17 +00:00
parent 5eed9865d6
commit e03d97eab6
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/lang/english.txt
View File

@@ -3622,7 +3622,8 @@ STR_VEHICLE_STATUS_LEAVING :{LTBLUE}Leaving
STR_VEHICLE_STATUS_CRASHED :{RED}Crashed! STR_VEHICLE_STATUS_CRASHED :{RED}Crashed!
STR_VEHICLE_STATUS_BROKEN_DOWN :{RED}Broken down STR_VEHICLE_STATUS_BROKEN_DOWN :{RED}Broken down
STR_VEHICLE_STATUS_STOPPED :{RED}Stopped STR_VEHICLE_STATUS_STOPPED :{RED}Stopped
STR_VEHICLE_STATUS_BROKEN_DOWN_VEL :{RED}Broken down - {STRING1}, {LTBLUE} {VELOCITY} STR_VEHICLE_STATUS_BROKEN_DOWN_VEL :{RED}Broken down - {STRING2}, {LTBLUE} {VELOCITY}
STR_VEHICLE_STATUS_BROKEN_DOWN_VEL_SHORT :{RED}Broken down - {STRING2}
STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL :{RED}Stopping, {VELOCITY} STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL :{RED}Stopping, {VELOCITY}
STR_VEHICLE_STATUS_TRAIN_NO_POWER :{RED}No power STR_VEHICLE_STATUS_TRAIN_NO_POWER :{RED}No power
STR_VEHICLE_STATUS_TRAIN_STUCK :{ORANGE}Waiting for free path STR_VEHICLE_STATUS_TRAIN_STUCK :{ORANGE}Waiting for free path
@@ -3661,7 +3662,7 @@ STR_VEHICLE_INFO_AGE_RUNNING_COST_YR :{BLACK}Age: {LT
STR_RUNNING :{LTBLUE}Running STR_RUNNING :{LTBLUE}Running
STR_NEED_REPAIR :{ORANGE}Train needs repair - max speed reduced to {VELOCITY} STR_NEED_REPAIR :{ORANGE}Train needs repair - max speed reduced to {VELOCITY}
STR_CURRENT_STATUS :{BLACK}Current status: {STRING2} STR_CURRENT_STATUS :{BLACK}Current status: {STRING3}
# The next two need to stay in this order # The next two need to stay in this order
STR_VEHICLE_INFO_AGE :{COMMA} year{P "" s} ({COMMA}) STR_VEHICLE_INFO_AGE :{COMMA} year{P "" s} ({COMMA})

2
src/train_gui.cpp
View File

@@ -254,7 +254,7 @@ static void TrainDetailsInfoTab(const Train *v, int left, int right, int y, byte
case 2: case 2:
if (v->breakdown_ctr == 1) { if (v->breakdown_ctr == 1) {
if (_settings_game.vehicle.improved_breakdowns) { if (_settings_game.vehicle.improved_breakdowns) {
SetDParam(0, STR_VEHICLE_STATUS_BROKEN_DOWN_VEL); SetDParam(0, STR_VEHICLE_STATUS_BROKEN_DOWN_VEL_SHORT);
SetDParam(1, STR_BREAKDOWN_TYPE_CRITICAL + v->breakdown_type); SetDParam(1, STR_BREAKDOWN_TYPE_CRITICAL + v->breakdown_type);
if (v->breakdown_type == BREAKDOWN_LOW_SPEED) { if (v->breakdown_type == BREAKDOWN_LOW_SPEED) {
SetDParam(2, min(v->First()->GetCurrentMaxSpeed(), v->breakdown_severity)); SetDParam(2, min(v->First()->GetCurrentMaxSpeed(), v->breakdown_severity));

2
src/vehicle_gui.cpp
View File

@@ -2613,7 +2613,7 @@ public:
} else if (v->breakdown_ctr == 1 || (v->type == VEH_TRAIN && Train::From(v)->flags & VRF_IS_BROKEN)) { } else if (v->breakdown_ctr == 1 || (v->type == VEH_TRAIN && Train::From(v)->flags & VRF_IS_BROKEN)) {
if (_settings_game.vehicle.improved_breakdowns) { if (_settings_game.vehicle.improved_breakdowns) {
str = STR_VEHICLE_STATUS_BROKEN_DOWN_VEL; str = STR_VEHICLE_STATUS_BROKEN_DOWN_VEL;
SetDParam(2, v->GetDisplaySpeed()); SetDParam(3, v->GetDisplaySpeed());
} else { } else {
str = STR_VEHICLE_STATUS_BROKEN_DOWN; str = STR_VEHICLE_STATUS_BROKEN_DOWN;
} }