From 5f478df06f4c04bdef94874860a1b40e8d0d62fe Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 7 Jun 2014 22:33:10 +0300 Subject: Improve a bit video mode initialisation code. --- src/graphicsmanager.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/graphicsmanager.cpp') diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index 870f52bb9..25c083124 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -40,6 +40,7 @@ #include "configuration.h" #include "logger.h" +#include "settings.h" #include "render/graphics.h" #include "render/mgl.h" @@ -245,10 +246,10 @@ int GraphicsManager::detectGraphics() | (1024 * textureSampler) | (2048 * compressTextures); } -void GraphicsManager::createRenderers(const bool noOpenGL) +void GraphicsManager::createRenderers() { RenderType useOpenGL = RENDER_SOFTWARE; - if (!noOpenGL) + if (!settings.options.noOpenGL) useOpenGL = intToRenderType(config.getIntValue("opengl")); // Setup image loading for the right image format @@ -311,10 +312,10 @@ void GraphicsManager::createRenderers(const bool noOpenGL) #else // USE_OPENGL -void GraphicsManager::createRenderers(const bool noOpenGL) +void GraphicsManager::createRenderers() { RenderType useOpenGL = RENDER_SOFTWARE; - if (!noOpenGL) + if (!settings.options.noOpenGL) useOpenGL = intToRenderType(config.getIntValue("opengl")); // Setup image loading for the right image format @@ -421,7 +422,7 @@ void GraphicsManager::setVideoMode() } } -void GraphicsManager::initGraphics(const bool noOpenGL) +void GraphicsManager::initGraphics() { openGLMode = intToRenderType(config.getIntValue("opengl")); #ifdef USE_OPENGL @@ -435,8 +436,9 @@ void GraphicsManager::initGraphics(const bool noOpenGL) config.getBoolValue("alphaCache")); ImageHelper::setEnableAlpha(config.getFloatValue("guialpha") != 1.0F); #endif - createRenderers(noOpenGL); + createRenderers(); detectPixelSize(); + setVideoMode(); } #ifdef USE_SDL2 -- cgit v1.2.3-60-g2f50