diff --git a/src/lang/english.txt b/src/lang/english.txt index cf08b94031..0b726f36e6 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3622,7 +3622,8 @@ STR_VEHICLE_STATUS_LEAVING :{LTBLUE}Leaving STR_VEHICLE_STATUS_CRASHED :{RED}Crashed! STR_VEHICLE_STATUS_BROKEN_DOWN :{RED}Broken down 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_NO_POWER :{RED}No power 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_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 STR_VEHICLE_INFO_AGE :{COMMA} year{P "" s} ({COMMA}) diff --git a/src/train_gui.cpp b/src/train_gui.cpp index 139dae8293..f4e78f971c 100644 --- a/src/train_gui.cpp +++ b/src/train_gui.cpp @@ -254,15 +254,15 @@ static void TrainDetailsInfoTab(const Train *v, int left, int right, int y, byte case 2: if (v->breakdown_ctr == 1) { 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); 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)); } else if (v->breakdown_type == BREAKDOWN_LOW_POWER) { - SetDParam(2, v->breakdown_severity * 100 / 256 ); + SetDParam(2, v->breakdown_severity * 100 / 256); } } else { - SetDParam( 0, STR_VEHICLE_STATUS_BROKEN_DOWN ); + SetDParam(0, STR_VEHICLE_STATUS_BROKEN_DOWN); } } else { if (HasBit(v->flags, VRF_NEED_REPAIR)) { diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index f1f057f78b..4d27751710 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -2613,7 +2613,7 @@ public: } else if (v->breakdown_ctr == 1 || (v->type == VEH_TRAIN && Train::From(v)->flags & VRF_IS_BROKEN)) { if (_settings_game.vehicle.improved_breakdowns) { str = STR_VEHICLE_STATUS_BROKEN_DOWN_VEL; - SetDParam(2, v->GetDisplaySpeed()); + SetDParam(3, v->GetDisplaySpeed()); } else { str = STR_VEHICLE_STATUS_BROKEN_DOWN; } @@ -2630,7 +2630,7 @@ public: SetDParam(0, STR_BREAKDOWN_TYPE_CRITICAL + w->breakdown_type); if (w->breakdown_type == BREAKDOWN_LOW_SPEED) { - SetDParam(1, min( w->First()->GetDisplayMaxSpeed(), w->breakdown_severity >> ((v->type == VEH_TRAIN) ? 0 : 1))); + SetDParam(1, min(w->First()->GetDisplayMaxSpeed(), w->breakdown_severity >> ((v->type == VEH_TRAIN) ? 0 : 1))); } else if (w->breakdown_type == BREAKDOWN_LOW_POWER) { int percent; if (v->type == VEH_TRAIN) {