summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-27 15:17:31 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-27 15:17:31 +0300
commita1b59326cb4cd70bb2347e9776965a2a0d4895fd (patch)
tree5aa96742f74488679db41415777e2bd60d0d1e58 /src
parent85d30284660318cb1c41a366852e6b6d1d4c7273 (diff)
downloadmv-a1b59326cb4cd70bb2347e9776965a2a0d4895fd.tar.gz
mv-a1b59326cb4cd70bb2347e9776965a2a0d4895fd.tar.bz2
mv-a1b59326cb4cd70bb2347e9776965a2a0d4895fd.tar.xz
mv-a1b59326cb4cd70bb2347e9776965a2a0d4895fd.zip
Rename initGraphics into intoRenderers.
Diffstat (limited to 'src')
-rw-r--r--src/client.cpp12
-rw-r--r--src/graphicsmanager.cpp4
-rw-r--r--src/graphicsmanager.h2
3 files changed, 10 insertions, 8 deletions
diff --git a/src/client.cpp b/src/client.cpp
index b42dd51c6..2af0eb84d 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -365,9 +365,15 @@ void Client::gameInit()
extractDataDir();
mountDataDir();
setIcon();
+ checkConfigVersion();
+ logVars();
+ Cpu::detect();
initGraphics();
#else
setIcon();
+ checkConfigVersion();
+ logVars();
+ Cpu::detect();
initGraphics();
extractDataDir();
mountDataDir();
@@ -537,8 +543,6 @@ void Client::createWindows()
void Client::initGraphics()
{
- checkConfigVersion();
-
#if defined(USE_OPENGL)
#if !defined(ANDROID) && !defined(__APPLE__) && !defined(__native_client__)
if (!mOptions.safeMode && mOptions.test.empty()
@@ -573,9 +577,7 @@ void Client::initGraphics()
config.getBoolValue("alphaCache"));
ImageHelper::setEnableAlpha(config.getFloatValue("guialpha") != 1.0F);
#endif
- logVars();
- Cpu::detect();
- graphicsManager.initGraphics(mOptions.noOpenGL);
+ graphicsManager.createRenderers(mOptions.noOpenGL);
graphicsManager.detectPixelSize();
runCounters = config.getBoolValue("packetcounters");
applyVSync();
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index f624ed850..8dffafeb4 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -238,7 +238,7 @@ int GraphicsManager::detectGraphics()
| (1024 * textureSampler) | (2048 * compressTextures);
}
-void GraphicsManager::initGraphics(const bool noOpenGL)
+void GraphicsManager::createRenderers(const bool noOpenGL)
{
RenderType useOpenGL = RENDER_SOFTWARE;
if (!noOpenGL)
@@ -304,7 +304,7 @@ void GraphicsManager::initGraphics(const bool noOpenGL)
#else // USE_OPENGL
-void GraphicsManager::initGraphics(const bool noOpenGL)
+void GraphicsManager::createRenderers(const bool noOpenGL)
{
RenderType useOpenGL = RENDER_SOFTWARE;
if (!noOpenGL)
diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h
index ff70e7634..991d7e63b 100644
--- a/src/graphicsmanager.h
+++ b/src/graphicsmanager.h
@@ -76,7 +76,7 @@ class GraphicsManager final
~GraphicsManager();
- void initGraphics(const bool noOpenGL);
+ void createRenderers(const bool noOpenGL);
static void setVideoMode();