Merge remote-tracking branch 'upstream/master'

This commit is contained in:
dP
2020-08-09 22:02:18 +03:00
80 changed files with 791 additions and 449 deletions
+1 -3
View File
@@ -262,12 +262,10 @@ bool VideoDriver_SDL::CreateMainSurface(uint w, uint h, bool resize)
seprintf(caption, lastof(caption), "OpenTTD %s", _openttd_revision);
if (_sdl_window == nullptr) {
Uint32 flags = SDL_WINDOW_SHOWN;
Uint32 flags = SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE;
if (_fullscreen) {
flags |= SDL_WINDOW_FULLSCREEN;
} else {
flags |= SDL_WINDOW_RESIZABLE;
}
_sdl_window = SDL_CreateWindow(