diff --git a/src/lang/english.txt b/src/lang/english.txt index 769fc78427..a331a7032f 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3828,8 +3828,8 @@ STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP :{BLACK}Send ins STR_VEHICLE_LIST_REPLACE_VEHICLES :Replace vehicles STR_VEHICLE_LIST_SEND_FOR_SERVICING :Send for Servicing STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Profit this year: {CURRENCY_LONG} (last year: {CURRENCY_LONG}) -STR_VEHICLE_LIST_CARGO :{TINY_FONT}{BLACK}[{CARGO_LIST}] -STR_VEHICLE_LIST_NAME_AND_CARGO :{TINY_FONT}{BLACK}{STRING1} {STRING1} +STR_VEHICLE_LIST_CARGO :[{CARGO_LIST}] +STR_VEHICLE_LIST_NAME_AND_CARGO :{STRING1} {STRING1} STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT :Send to Depot STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT :Send to Depot @@ -5608,11 +5608,9 @@ STR_JUST_RAW_STRING :{RAW_STRING} STR_JUST_BIG_RAW_STRING :{BIG_FONT}{RAW_STRING} # Slightly 'raw' stringcodes with colour or size -STR_TINY_GROUP :{TINY_FONT}{GROUP} STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATION :{TINY_FONT}{BLACK}{STATION} STR_TINY_BLACK_HEIGHT :{TINY_FONT}{BLACK}{HEIGHT} -STR_TINY_BLACK_VEHICLE :{TINY_FONT}{BLACK}{VEHICLE} STR_TINY_RIGHT_ARROW :{TINY_FONT}{RIGHT_ARROW} STR_BLACK_1 :{BLACK}1 diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 32ec4c55b6..c7642d9484 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -1692,31 +1692,31 @@ void BaseVehicleListWindow::DrawVehicleListItems(VehicleID selected_vehicle, int if (!v->name.empty()) { /* The vehicle got a name so we will print it and the cargoes */ - SetDParam(0, STR_TINY_BLACK_VEHICLE); + SetDParam(0, STR_VEHICLE_NAME); SetDParam(1, v->index); SetDParam(2, STR_VEHICLE_LIST_CARGO); SetDParam(3, vehicle_cargoes); - DrawString(tr.left, tr.right, ir.top, STR_VEHICLE_LIST_NAME_AND_CARGO); + DrawString(tr.left, tr.right, ir.top, STR_VEHICLE_LIST_NAME_AND_CARGO, TC_BLACK, SA_LEFT, false, FS_SMALL); } else if (v->group_id != DEFAULT_GROUP) { /* The vehicle has no name, but is member of a group, so print group name and the cargoes */ - SetDParam(0, STR_TINY_GROUP); + SetDParam(0, STR_GROUP_NAME); SetDParam(1, v->group_id); SetDParam(2, STR_VEHICLE_LIST_CARGO); SetDParam(3, vehicle_cargoes); - DrawString(tr.left, tr.right, ir.top, STR_VEHICLE_LIST_NAME_AND_CARGO); + DrawString(tr.left, tr.right, ir.top, STR_VEHICLE_LIST_NAME_AND_CARGO, TC_BLACK, SA_LEFT, false, FS_SMALL); } else { /* The vehicle has no name, and is not a member of a group, so just print the cargoes */ SetDParam(0, vehicle_cargoes); - DrawString(tr.left, tr.right, ir.top, STR_VEHICLE_LIST_CARGO); + DrawString(tr.left, tr.right, ir.top, STR_VEHICLE_LIST_CARGO, TC_BLACK, SA_LEFT, false, FS_SMALL); } } else if (!v->name.empty()) { /* The vehicle got a name so we will print it */ SetDParam(0, v->index); - DrawString(tr.left, tr.right, ir.top, STR_TINY_BLACK_VEHICLE); + DrawString(tr.left, tr.right, ir.top, STR_VEHICLE_NAME, TC_BLACK, SA_LEFT, false, FS_SMALL); } else if (v->group_id != DEFAULT_GROUP) { /* The vehicle has no name, but is member of a group, so print group name */ SetDParam(0, v->group_id); - DrawString(tr.left, tr.right, ir.top, STR_TINY_GROUP, TC_BLACK); + DrawString(tr.left, tr.right, ir.top, STR_GROUP_NAME, TC_BLACK, SA_LEFT, false, FS_SMALL); } if (show_orderlist) DrawSmallOrderList(v, olr.left, olr.right, ir.top, this->order_arrow_width, v->cur_real_order_index);