Merge tag '1.11.0-beta1' into jgrpp
# Conflicts: # src/console_cmds.cpp # src/gfx_func.h # src/industry.h # src/lang/czech.txt # src/lang/estonian.txt # src/lang/german.txt # src/lang/indonesian.txt # src/lang/japanese.txt # src/lang/norwegian_bokmal.txt # src/lang/russian.txt # src/lang/slovak.txt # src/saveload/saveload.h # src/station_gui.cpp # src/town_gui.cpp # src/vehicle_gui.cpp # src/video/sdl2_v.cpp # src/waypoint_gui.cpp
This commit is contained in:
@@ -417,6 +417,8 @@ const char *VideoDriver_Allegro::Start(const StringList &parm)
|
||||
}
|
||||
_allegro_instance_count++;
|
||||
|
||||
this->UpdateAutoResolution();
|
||||
|
||||
install_timer();
|
||||
install_mouse();
|
||||
install_keyboard();
|
||||
|
||||
Reference in New Issue
Block a user