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

Merge branch 'departure-boards-sx' into jgrpp

Browse Source 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-02 18:23:25 +01:00
parent 6596ba216c 6c81f8f35b
commit 6452b0fe02
34 changed files with 2471 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/saveload/afterload.cpp
View File

@@ -2968,6 +2968,23 @@ bool AfterLoadGame()
#endif
}
if (SlXvIsFeaturePresent(XSLFI_TIMETABLES_START_TICKS) && WALLCLOCK_NETWORK_COMPATIBLE) {
// savegame timetable start is in ticks, but we want it in days, fix it up
Vehicle *v;
FOR_ALL_VEHICLES(v) {
if (v->timetable_start != 0) {
v->timetable_start /= DAY_TICKS;
}
}
} else if (SlXvIsFeatureMissing(XSLFI_TIMETABLES_START_TICKS) && (!WALLCLOCK_NETWORK_COMPATIBLE)) {
// savegame timetable start is in days, but we want it in ticks, fix it up
Vehicle *v;
FOR_ALL_VEHICLES(v) {
if (v->timetable_start != 0) {
v->timetable_start *= DAY_TICKS;
}
}
}
/* Station acceptance is some kind of cache */
if (IsSavegameVersionBefore(127)) {