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

16
src/openttd.cpp
View File

@@ -1394,11 +1394,17 @@ void StateGameLoop()
Backup<CompanyByte> cur_company(_current_company, OWNER_NONE, FILE_LINE);
BasePersistentStorageArray::SwitchMode(PSM_ENTER_GAMELOOP);
AnimateAnimatedTiles();
IncreaseDate();
RunTileLoop();
CallVehicleTicks();
CallLandscapeTick();
_tick_skip_counter++;
if (_tick_skip_counter < _settings_game.economy.day_length_factor) {
CallVehicleTicks();
} else {
_tick_skip_counter = 0;
AnimateAnimatedTiles();
IncreaseDate();
RunTileLoop();
CallVehicleTicks();
CallLandscapeTick();
}
BasePersistentStorageArray::SwitchMode(PSM_LEAVE_GAMELOOP);
#ifndef DEBUG_DUMP_COMMANDS