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

1
src/settings_type.h
View File

@@ -596,6 +596,7 @@ struct CompanySettings {
VehicleDefaultSettings vehicle; ///< default settings for vehicles
uint8 order_occupancy_smoothness; ///< percentage smoothness of occupancy measurement changes
uint8 auto_timetable_separation_rate; ///< percentage of auto timetable separation change to apply
bool infra_others_buy_in_depot[4]; ///< other companies can buy/autorenew in this companies depots (where infra sharing enabled)
};
/** All settings together for the game. */