1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:23:52 +00:00

Merge remote-tracking branch 'swick/sdl2fix'

This commit is contained in:
Marc Zinnschlag 2013-07-29 13:51:00 +02:00
commit a547c2584e

View file

@ -245,18 +245,16 @@ void OgreRenderer::createWindow(const std::string &title, const WindowSettings&
params.insert(std::make_pair("FSAA", settings.fsaa)); params.insert(std::make_pair("FSAA", settings.fsaa));
params.insert(std::make_pair("vsync", settings.vsync ? "true" : "false")); params.insert(std::make_pair("vsync", settings.vsync ? "true" : "false"));
int pos_x = SDL_WINDOWPOS_UNDEFINED, int pos_x = SDL_WINDOWPOS_CENTERED_DISPLAY(settings.screen),
pos_y = SDL_WINDOWPOS_UNDEFINED; pos_y = SDL_WINDOWPOS_CENTERED_DISPLAY(settings.screen);
if(settings.fullscreen) if(settings.fullscreen)
{ {
SDL_Rect display_bounds; pos_x = SDL_WINDOWPOS_UNDEFINED_DISPLAY(settings.screen);
if(SDL_GetDisplayBounds(settings.screen, &display_bounds) != 0) pos_y = SDL_WINDOWPOS_UNDEFINED_DISPLAY(settings.screen);
throw std::runtime_error("Couldn't get display bounds!");
pos_x = display_bounds.x;
pos_y = display_bounds.y;
} }
// Create an application window with the following settings: // Create an application window with the following settings:
mSDLWindow = SDL_CreateWindow( mSDLWindow = SDL_CreateWindow(
"OpenMW", // window title "OpenMW", // window title