From 63ebe55b2d9b14f9f368b2e744d00fd7c1d7ff67 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 30 Apr 2012 23:15:23 +0300 Subject: Move set video mode code from client to graphics manager. --- src/graphicsmanager.cpp | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'src/graphicsmanager.cpp') diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index 5beede539..83439b03e 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -142,3 +142,43 @@ void GraphicsManager::logString(const char *format, int num) logger->log(format, str); #endif } + +void GraphicsManager::setVideoMode() +{ + const int width = config.getIntValue("screenwidth"); + const int height = config.getIntValue("screenheight"); + const int bpp = 0; + const bool fullscreen = config.getBoolValue("screen"); + const bool hwaccel = config.getBoolValue("hwaccel"); + const bool enableResize = config.getBoolValue("enableresize"); + const bool noFrame = config.getBoolValue("noframe"); + + // Try to set the desired video mode + if (!mainGraphics->setVideoMode(width, height, bpp, + fullscreen, hwaccel, enableResize, noFrame)) + { + logger->log(strprintf("Couldn't set %dx%dx%d video mode: %s", + width, height, bpp, SDL_GetError())); + + const int oldWidth = config.getValueInt("oldscreenwidth", -1); + const int oldHeight = config.getValueInt("oldscreenheight", -1); + const int oldFullscreen = config.getValueInt("oldscreen", -1); + if (oldWidth != -1 && oldHeight != -1 && oldFullscreen != -1) + { + config.deleteKey("oldscreenwidth"); + config.deleteKey("oldscreenheight"); + config.deleteKey("oldscreen"); + + config.setValueInt("screenwidth", oldWidth); + config.setValueInt("screenheight", oldHeight); + config.setValue("screen", oldFullscreen == 1); + if (!mainGraphics->setVideoMode(oldWidth, oldHeight, bpp, + oldFullscreen, hwaccel, enableResize, noFrame)) + { + logger->safeError(strprintf("Couldn't restore %dx%dx%d " + "video mode: %s", oldWidth, oldHeight, bpp, + SDL_GetError())); + } + } + } +} \ No newline at end of file -- cgit v1.2.3-60-g2f50