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

Merge branch 'auto_timetables-sx' into jgrpp

Browse Source 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/company_settings.ini
#	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2016-05-08 01:13:35 +01:00
parent 04b188bd7d d59252d15b
commit 4c5173b6bf
21 changed files with 140 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/saveload/company_sl.cpp
View File

@@ -494,10 +494,13 @@ static void Load_PLYR()
SaveLoad_PLYR(c);
_company_colours[index] = (Colours)c->colour;
// setting moved from game settings to company settings
// settings moved from game settings to company settings
if (SlXvIsFeaturePresent(XSLFI_AUTO_TIMETABLE, 1, 2)) {
c->settings.auto_timetable_separation_rate = _settings_game.order.old_timetable_separation_rate;
}
if (SlXvIsFeaturePresent(XSLFI_AUTO_TIMETABLE, 1, 3)) {
c->settings.vehicle.auto_separation_by_default = _settings_game.order.old_timetable_separation;
}
}
}