Merge branch 'master' into jgrpp
# Conflicts: # src/game/game_gui.cpp # src/graph_gui.cpp # src/linkgraph/linkgraph_gui.h # src/newgrf.cpp # src/order_gui.cpp # src/saveload/engine_sl.cpp # src/saveload/saveload.h # src/script/api/script_text.cpp # src/script/script_gui.cpp # src/settings_table.cpp # src/strings.cpp # src/table/settings/economy_settings.ini # src/table/settings/locale_settings.ini # src/timetable_gui.cpp
This commit is contained in:
@@ -591,7 +591,7 @@ struct BuildRailToolbarWindow : Window {
|
||||
if (rti->max_speed > 0) {
|
||||
SetDParam(0, STR_TOOLBAR_RAILTYPE_VELOCITY);
|
||||
SetDParam(1, rti->strings.toolbar_caption);
|
||||
SetDParam(2, rti->max_speed);
|
||||
SetDParam(2, PackVelocity(rti->max_speed, VEH_TRAIN));
|
||||
} else {
|
||||
SetDParam(0, rti->strings.toolbar_caption);
|
||||
}
|
||||
|
Reference in New Issue
Block a user