From 133a451912b15e4c420851dcddd4caae2b641230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn@lindeijer.nl>
Date: Thu, 2 Aug 2012 02:50:02 +0200
Subject: [PATCH] Enable OpenGL by default on all platforms

Before it was only enabled by default for Mac.

Reviewed-by: Erik Schilling
---
 src/client.cpp   | 6 +-----
 src/defaults.cpp | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index 28affce62..9af6020e6 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 0dc8e3ed0..2fcca4f8d 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);