diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2005-08-14 23:57:06 +0000 |
|---|---|---|
| committer | Björn Steinbrink <B.Steinbrink@gmx.de> | 2005-08-14 23:57:06 +0000 |
| commit | cfaf8b836b21842b5d22ad774f93c2c364d33c0b (patch) | |
| tree | 00dca4d03b2f9cff3ec0cef4ed8b6b05c4218c2b /src/gui | |
| parent | e475dc028ca49324f824a7e4d6d16f54781b9bee (diff) | |
| download | mana-cfaf8b836b21842b5d22ad774f93c2c364d33c0b.tar.gz mana-cfaf8b836b21842b5d22ad774f93c2c364d33c0b.tar.bz2 mana-cfaf8b836b21842b5d22ad774f93c2c364d33c0b.tar.xz mana-cfaf8b836b21842b5d22ad774f93c2c364d33c0b.zip | |
Fully removed the useOpenGL global.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/browserbox.cpp | 13 | ||||
| -rw-r--r-- | src/gui/gui.cpp | 3 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp index 5cae9fb7..6fc91858 100644 --- a/src/gui/browserbox.cpp +++ b/src/gui/browserbox.cpp @@ -21,16 +21,17 @@ * $Id$ */ +#include "browserbox.h" + #include <guichan/imagefont.hpp> -#ifdef USE_OPENGL -#include "../resources/resourcemanager.h" -#endif -#include "browserbox.h" #include "linkhandler.h" #include "gui.h" -extern bool useOpenGL; +#ifdef USE_OPENGL +#include "../configuration.h" +#include "../resources/resourcemanager.h" +#endif int BrowserBox::instances = 0; gcn::ImageFont* BrowserBox::browserFont; @@ -49,7 +50,7 @@ BrowserBox::BrowserBox(unsigned int mode): if (instances == 0) { #ifdef USE_OPENGL - if (useOpenGL) { + if (config.getValue("opengl", 0)) { browserFont = new gcn::ImageFont( ResourceManager::getInstance()->getRealPath( "graphics/gui/browserfont.png"), diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 2eaa9d76..197177cd 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -52,7 +52,6 @@ #include "../resources/resourcemanager.h" extern Being* autoTarget; -extern bool useOpenGL; // Guichan stuff Gui *gui; @@ -72,7 +71,7 @@ Gui::Gui(Graphics *graphics): mCustomCursor(false) { #ifdef USE_OPENGL - if (useOpenGL) { + if (config.getValue("opengl", 0)) { // Set graphics setGraphics((gcn::OpenGLGraphics*)graphics); |