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

Merge branch 'order_occupancy-sx' into jgrpp

Browse Source 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/settings_gui.cpp
	src/table/company_settings.ini
This commit is contained in:
Jonathan G Rennison
2015-10-25 21:47:07 +00:00
parent 5dd3306850 6d263226d8
commit 60a677692e
9 changed files with 257 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/settings_type.h
View File

@@ -481,7 +481,8 @@ struct OrderSettings {
bool timetable_separation; ///< whether to perform automatic separation based on timetable
uint8 timetable_separation_rate; ///< percentage of timetable separation change to apply
bool serviceathelipad; ///< service helicopters at helipads automatically (no need to send to depot)
uint8 occupancy_smoothness; ///< percentage smoothness of occupancy measurement changes
uint8 old_occupancy_smoothness; ///< moved to company settings: percentage smoothness of occupancy measurement changes
};
/** Settings related to vehicles. */
@@ -588,6 +589,7 @@ struct CompanySettings {
uint32 engine_renew_money; ///< minimum amount of money before autorenew is used
bool renew_keep_length; ///< sell some wagons if after autoreplace the train is longer than before
VehicleDefaultSettings vehicle; ///< default settings for vehicles
uint8 order_occupancy_smoothness; ///< percentage smoothness of occupancy measurement changes
};
/** All settings together for the game. */