diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-08-02 02:50:02 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-08-05 17:24:56 +0200 |
| commit | 133a451912b15e4c420851dcddd4caae2b641230 (patch) | |
| tree | c6277ed5d01dedc73f8c50b0f07615137fb021b5 /src | |
| parent | b51a15abb93a0dd0fc491419d12ea58637ebf089 (diff) | |
| download | mana-133a451912b15e4c420851dcddd4caae2b641230.tar.gz mana-133a451912b15e4c420851dcddd4caae2b641230.tar.bz2 mana-133a451912b15e4c420851dcddd4caae2b641230.tar.xz mana-133a451912b15e4c420851dcddd4caae2b641230.zip | |
Enable OpenGL by default on all platforms
Before it was only enabled by default for Mac.
Reviewed-by: Erik Schilling
Diffstat (limited to 'src')
| -rw-r--r-- | src/client.cpp | 6 | ||||
| -rw-r--r-- | src/defaults.cpp | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/client.cpp b/src/client.cpp index 28affce6..9af6020e 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 0dc8e3ed..2fcca4f8 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); |