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

Merge branch 'day_length-sx' into jgrpp

Browse Source 
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/timetable_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-09 13:51:36 +01:00
parent e0bc6e0cf6 41062cf78e
commit 9565e5b9b1
13 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/settings_type.h
View File

@@ -532,6 +532,7 @@ struct EconomySettings {
bool allow_town_level_crossings; ///< towns are allowed to build level crossings
int8 town_cargo_factor; ///< power-of-two multiplier for town (passenger, mail) generation. May be negative.
bool infrastructure_maintenance; ///< enable monthly maintenance fee for owner infrastructure
uint8 day_length_factor; ///< factor which the length of day is multiplied
};
struct LinkGraphSettings {