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
2015-08-09 13:51:36 +01:00
parent e0bc6e0cf6 41062cf78e
commit 9565e5b9b1
13 changed files with 40 additions and 9 deletions
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -63,6 +63,7 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
 	_pause_mode = PM_UNPAUSED;
 	_fast_forward = 0;
 	_tick_counter = 0;
+	_tick_skip_counter = 0;
 	_cur_tileloop_tile = 1;
 	_thd.redsq = INVALID_TILE;
 	if (reset_settings) MakeNewgameSettingsLive();