Merge branch 'master' into jgrpp

# Conflicts: # src/lang/french.txt # src/network/network_udp.cpp
2021-04-12 22:59:30 +01:00
parent 76981ca8cd 433602b072
commit 253d54ce05
23 changed files with 174 additions and 81 deletions
--- a/src/video/video_driver.hpp
+++ b/src/video/video_driver.hpp
@@ -41,7 +41,7 @@ class VideoDriver : public Driver {
 	const uint DEFAULT_WINDOW_HEIGHT = 480u; ///< Default window height.

 public:
-	VideoDriver() : is_game_threaded(true), change_blitter(nullptr) {}
+	VideoDriver() : fast_forward_key_pressed(false), fast_forward_via_key(false), is_game_threaded(true), change_blitter(nullptr) {}

 	/**
 	 * Mark a particular area dirty.