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

Merge branch 'tracerestrict-sx' into jgrpp

Browse Source 
Conflicts:
	src/lang/english.txt
	src/settings_gui.cpp
	src/settings_type.h
	src/table/settings.ini
This commit is contained in:
Jonathan G Rennison
2015-12-09 01:03:37 +00:00
parent ad3255f347 07aba3eb84
commit 69f3844d2e
8 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/settings_gui.cpp
View File

@@ -1480,6 +1480,7 @@ static SettingsContainer &GetSettingsTree()
graphics->Add(new SettingEntry("gui.show_vehicle_route_steps"));
graphics->Add(new SettingEntry("gui.show_vehicle_route"));
graphics->Add(new SettingEntry("gui.dash_level_of_route_lines"));
graphics->Add(new SettingEntry("gui.show_restricted_signal_default"));
}
SettingsPage *sound = main->Add(new SettingsPage(STR_CONFIG_SETTING_SOUND));