Merge branch 'pr-270' into jgrpp

# Conflicts:
#	src/lang/english.txt
#	src/settings_type.h
#	src/table/settings.ini
This commit is contained in:
Jonathan G Rennison
2021-06-15 19:32:54 +01:00
5 changed files with 74 additions and 2 deletions

View File

@@ -221,6 +221,7 @@ struct GUISettings : public TimeSettings {
uint8 vehicle_names; ///< Vehicle naming scheme
bool shade_trees_on_slopes; ///< Shade trees on slopes
uint8 station_rating_tooltip_mode; ///< Station rating tooltip mode
uint8 demolish_confirm_mode; ///< Demolition confirmation mode
uint16 console_backlog_timeout; ///< the minimum amount of time items should be in the console backlog before they will be removed in ~3 seconds granularity.
uint16 console_backlog_length; ///< the minimum amount of items in the console backlog before items will be removed.