Merge branch 'master' into jgrpp

# Conflicts:
#	src/company_cmd.cpp
#	src/core/geometry_func.cpp
#	src/date.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/video/allegro_v.cpp
#	src/video/dedicated_v.cpp
#	src/video/null_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp

src/video/null_v.cpp

@@ -10,6 +10,7 @@
 #include "../stdafx.h"
 #include "../gfx_func.h"
 #include "../blitter/factory.hpp"
+#include "../window_func.h"
 #include "null_v.h"
 
 #include "../safeguards.h"
@@ -51,12 +52,14 @@ void VideoDriver_Null::MainLoop()
 		while (!_exit_game) {
 			GameLoop();
 			GameLoopPaletteAnimations();
+			InputLoop();
 			UpdateWindows();
 		}
 	} else {
 		for (int i = 0; i < this->ticks; i++) {
 			GameLoop();
 			GameLoopPaletteAnimations();
+			InputLoop();
 			UpdateWindows();
 		}
 	}