summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYohann Ferreira <bertram@cegetel.net>2005-10-04 17:27:27 +0000
committerYohann Ferreira <bertram@cegetel.net>2005-10-04 17:27:27 +0000
commit6b5c2775d35623f70fe1218710b6613d38395659 (patch)
tree4ee5036b7f304d33cb39cc4f83c0b35476643e81 /src
parent623fa32c10d7fda1240c256eefd05a7157662198 (diff)
downloadmana-6b5c2775d35623f70fe1218710b6613d38395659.tar.gz
mana-6b5c2775d35623f70fe1218710b6613d38395659.tar.bz2
mana-6b5c2775d35623f70fe1218710b6613d38395659.tar.xz
mana-6b5c2775d35623f70fe1218710b6613d38395659.zip
Set the white font in the ministatus window only in sdl mode until we have found a solution in openGL Mode. Disable the openGL Box when compiled without opengl support.
Diffstat (limited to 'src')
-rw-r--r--src/gui/ministatus.cpp7
-rw-r--r--src/gui/setup.cpp3
2 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index adfda434..eb2ebf53 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -27,6 +27,7 @@
#include <sstream>
#include "gui.h"
+#include <guichan/imagefont.hpp>
#include "progressbar.h"
#include "../playerinfo.h"
@@ -49,8 +50,10 @@ MiniStatusWindow::MiniStatusWindow():
hpLabel = new gcn::Label("");
mpLabel = new gcn::Label("");
- hpLabel->setFont((gcn::Font*)speechFont);
- mpLabel->setFont((gcn::Font*)speechFont);
+#ifndef USE_OPENGL
+ hpLabel->setFont(speechFont);
+ mpLabel->setFont(speechFont);
+#endif
add(hpBar);
add(mpBar);
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 582670a5..1938231a 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -103,6 +103,9 @@ Setup::Setup():
scrollArea = new ScrollArea(modeList);
fsCheckBox = new CheckBox("Full screen", false);
openGLCheckBox = new CheckBox("OpenGL", false);
+#ifndef USE_OPENGL
+ openGLCheckBox->setEnabled(false);
+#endif
customCursorCheckBox = new CheckBox("Custom cursor");
alphaLabel = new gcn::Label("Gui opacity");
alphaSlider = new Slider(0.2, 1.0);