Merge remote-tracking branch 'upstream/1.11' into 1.11

2021-03-15 20:11:52 +03:00
parent c8ff7bcf4d 1381a86a1e
commit c36ef2b3f3
327 changed files with 31198 additions and 8572 deletions
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -64,8 +64,8 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
 	AllocateMap(size_x, size_y);

 	_pause_mode = PM_UNPAUSED;
+	_game_speed = 100;
 	_pause_countdown = 0;
-	_fast_forward = 0;
 	_tick_counter = 0;
 	_cur_tileloop_tile = 1;
 	_thd.redsq = INVALID_TILE;