summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-12-10 21:10:07 +0300
committerAndrei Karas <akaras@inbox.ru>2016-12-10 21:10:07 +0300
commitbfd0d4d13b9b13b48e99122b271b792d18c2cd8a (patch)
tree527d2d9dafa8d284744f9f3383bec4916583c339
parent7e53a47d6f3e2dfb1446384e674f9d391bd23f7a (diff)
downloadmv-bfd0d4d13b9b13b48e99122b271b792d18c2cd8a.tar.gz
mv-bfd0d4d13b9b13b48e99122b271b792d18c2cd8a.tar.bz2
mv-bfd0d4d13b9b13b48e99122b271b792d18c2cd8a.tar.xz
mv-bfd0d4d13b9b13b48e99122b271b792d18c2cd8a.zip
Fix some issues without C++11 flags.
-rw-r--r--src/configmanager.cpp4
-rw-r--r--src/game.cpp4
-rw-r--r--src/graphicsmanager.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/configmanager.cpp b/src/configmanager.cpp
index 8358aa995..98916ebbd 100644
--- a/src/configmanager.cpp
+++ b/src/configmanager.cpp
@@ -263,7 +263,7 @@ void ConfigManager::storeSafeParameters()
enableMumble = config.getBoolValue("enableMumble");
enableMapReduce = config.getBoolValue("enableMapReduce");
- if (!settings.options.safeMode && tmpOpengl == RenderType::RENDER_SOFTWARE)
+ if (!settings.options.safeMode && tmpOpengl == RENDER_SOFTWARE)
{
// if video mode configured reset most settings to safe
config.setValue("hwaccel", false);
@@ -306,7 +306,7 @@ void ConfigManager::storeSafeParameters()
}
config.setValue("safemode", false);
- if (tmpOpengl == RenderType::RENDER_SOFTWARE)
+ if (tmpOpengl == RENDER_SOFTWARE)
{
config.setValue("hwaccel", tmpHwaccel);
config.setValue("opengl", CAST_S32(tmpOpengl));
diff --git a/src/game.cpp b/src/game.cpp
index 69333841f..dfbfeb5a1 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -402,7 +402,7 @@ Game::Game() :
viewport->requestMoveToBottom();
AnimatedSprite::setEnableCache(
- mainGraphics->getOpenGL() != RenderType::RENDER_SOFTWARE &&
+ mainGraphics->getOpenGL() != RENDER_SOFTWARE &&
config.getBoolValue("enableDelayedAnimations"));
CompoundSprite::setEnableDelay(
@@ -657,7 +657,7 @@ void Game::slowLogic()
effectManager->logic();
}
- if (mainGraphics->getOpenGL() != RenderType::RENDER_SOFTWARE)
+ if (mainGraphics->getOpenGL() != RENDER_SOFTWARE)
DelayedManager::delayedLoad();
#ifdef TMWA_SUPPORT
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index 3508f335b..b3b956cfe 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -527,9 +527,9 @@ void GraphicsManager::initGraphics()
#endif // ANDROID
SurfaceImageHelper::SDLSetEnableAlphaCache(
config.getBoolValue("alphaCache") &&
- openGLMode == RenderType::RENDER_SOFTWARE);
+ openGLMode == RENDER_SOFTWARE);
ImageHelper::setEnableAlpha((config.getFloatValue("guialpha") != 1.0F ||
- openGLMode != RenderType::RENDER_SOFTWARE) &&
+ openGLMode != RENDER_SOFTWARE) &&
config.getBoolValue("enableGuiOpacity"));
#else // USE_OPENGL
SurfaceImageHelper::SDLSetEnableAlphaCache(