Merge branch 'day_length-sx' into jgrpp

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
13 changed files with 40 additions and 9 deletions

View File

@@ -947,7 +947,7 @@ void CallVehicleTicks()
{
_vehicles_to_autoreplace.Clear();
RunVehicleDayProc();
if (_tick_skip_counter == 0) RunVehicleDayProc();
Station *st;
FOR_ALL_STATIONS(st) LoadUnloadStation(st);