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

Merge branch 'infrastructure_sharing-sx' into jgrpp

Browse Source 
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/company_settings.ini
This commit is contained in:
Jonathan G Rennison
2016-02-13 22:14:47 +00:00
parent 224e927e0c 5bc5d43ffb
commit 1f5535c0b1
6 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/settings_gui.cpp
View File

@@ -1641,6 +1641,10 @@ static SettingsContainer &GetSettingsTree()
company->Add(new SettingEntry("vehicle.auto_timetable_by_default"));
company->Add(new SettingEntry("auto_timetable_separation_rate"));
company->Add(new SettingEntry("order_occupancy_smoothness"));
company->Add(new SettingEntry("company.infra_others_buy_in_depot[0]"));
company->Add(new SettingEntry("company.infra_others_buy_in_depot[1]"));
company->Add(new SettingEntry("company.infra_others_buy_in_depot[2]"));
company->Add(new SettingEntry("company.infra_others_buy_in_depot[3]"));
}
SettingsPage *accounting = main->Add(new SettingsPage(STR_CONFIG_SETTING_ACCOUNTING));