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

Merge branch 'ingame_rivers' into jgrpp

Browse Source 
Conflicts:
	src/settings_gui.cpp
	src/settings_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-26 19:09:38 +01:00
parent 805986811a 9c75a3c477
commit 591d2ee8b9
6 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/settings_gui.cpp
View File

@@ -1702,6 +1702,7 @@ static SettingsContainer &GetSettingsTree()
limitations->Add(new SettingEntry("construction.road_stop_on_competitor_road"));
limitations->Add(new SettingEntry("vehicle.disable_elrails"));
limitations->Add(new SettingEntry("construction.maximum_signal_evaluations"));
limitations->Add(new SettingEntry("construction.enable_build_river"));
}
SettingsPage *disasters = main->Add(new SettingsPage(STR_CONFIG_SETTING_ACCIDENTS));