summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-08-02 02:50:02 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-08-02 02:50:02 +0200
commitf6bb0f06c1c6de9c2a893459e2e04e7b6ae58348 (patch)
tree8c8af99c4ee82246b1ccbac459ba2b2987c994e4
parent1a19ab21b2ae6d2fef980bbf33484dfb6591bbcb (diff)
downloadmana-f6bb0f06c1c6de9c2a893459e2e04e7b6ae58348.tar.gz
mana-f6bb0f06c1c6de9c2a893459e2e04e7b6ae58348.tar.bz2
mana-f6bb0f06c1c6de9c2a893459e2e04e7b6ae58348.tar.xz
mana-f6bb0f06c1c6de9c2a893459e2e04e7b6ae58348.zip
Enable OpenGL by default on all platforms
Before it was only enabled by default for Mac.
-rw-r--r--src/client.cpp6
-rw-r--r--src/defaults.cpp2
2 files changed, 2 insertions, 6 deletions
diff --git a/src/client.cpp b/src/client.cpp
index fec41f5e..8eb9b154 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -331,7 +331,7 @@ Client::Client(const Options &options):
}
#endif
- bool useOpenGL = !mOptions.noOpenGL && (config.getValue("opengl", 0) == 1);
+ bool useOpenGL = !mOptions.noOpenGL && (config.getValue("opengl", 1) == 1);
// Set up the transparency option for low CPU when not using OpenGL.
if (!useOpenGL && (config.getValue("disableTransparency", 0) == 1))
@@ -1225,11 +1225,7 @@ void Client::initConfiguration()
{
// Fill configuration with defaults
config.setValue("hwaccel", false);
-#if defined __APPLE__ && defined USE_OPENGL
config.setValue("opengl", true);
-#else
- config.setValue("opengl", false);
-#endif
config.setValue("screen", false);
config.setValue("sound", true);
config.setValue("guialpha", 0.8f);
diff --git a/src/defaults.cpp b/src/defaults.cpp
index facff7d8..1c387d63 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -78,7 +78,7 @@ DefaultsData* getConfigDefaults()
AddDEF(configData, "particleEmitterSkip", 1);
AddDEF(configData, "particleeffects", true);
AddDEF(configData, "logToStandardOut", false);
- AddDEF(configData, "opengl", false);
+ AddDEF(configData, "opengl", true);
AddDEF(configData, "screenwidth", defaultScreenWidth);
AddDEF(configData, "screenheight", defaultScreenHeight);
AddDEF(configData, "screen", false);