summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-10-18 23:08:05 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-10-18 23:08:05 +0000
commit189e03a2f26434284684772306a95e3caeb6fb25 (patch)
tree47a928a9dc7513f503fb989fb85471757fa6b6a3
parent86441fda9c561dd264039edc68ddabbf7cb54ce2 (diff)
downloadmana-189e03a2f26434284684772306a95e3caeb6fb25.tar.gz
mana-189e03a2f26434284684772306a95e3caeb6fb25.tar.bz2
mana-189e03a2f26434284684772306a95e3caeb6fb25.tar.xz
mana-189e03a2f26434284684772306a95e3caeb6fb25.zip
Fixed two forgotten main.h includes which caused OpenGL option in the setup
dialog and the font used in OpenGL mode in the BrowserBox not to function.
-rw-r--r--src/gui/browserbox.cpp3
-rw-r--r--src/gui/browserbox.h1
-rw-r--r--src/gui/setup_video.cpp1
3 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 65fdde64..21609434 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -21,14 +21,13 @@
* $Id$
*/
-#include "browserbox.h"
-
#include <algorithm>
#include <guichan/graphics.hpp>
#include <guichan/imagefont.hpp>
#include <guichan/mouseinput.hpp>
+#include "browserbox.h"
#include "linkhandler.h"
#ifdef USE_OPENGL
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index bd853cb4..666a7754 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -31,6 +31,7 @@
#include <guichan/mouselistener.hpp>
#include "../guichanfwd.h"
+#include "../main.h"
class LinkHandler;
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index d2c6d93c..cd1507a7 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -42,6 +42,7 @@
#include "../configuration.h"
#include "../graphics.h"
#include "../log.h"
+#include "../main.h"
#include "../utils/tostring.h"