summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2008-06-14 12:42:49 +0000
committerDavid Athay <ko2fan@gmail.com>2008-06-14 12:42:49 +0000
commit5fbb6c822dcf01297a29078eb6abc552dcb8b80d (patch)
tree5c6a76a2875b588063ad8d5c9200ff7994c30668 /src/gui
parent2f8ee95fbacb71e7cbca85fcc11e6f9f7e36c258 (diff)
downloadmana-5fbb6c822dcf01297a29078eb6abc552dcb8b80d.tar.gz
mana-5fbb6c822dcf01297a29078eb6abc552dcb8b80d.tar.bz2
mana-5fbb6c822dcf01297a29078eb6abc552dcb8b80d.tar.xz
mana-5fbb6c822dcf01297a29078eb6abc552dcb8b80d.zip
Fixed compilation errors and trade bug.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/browserbox.cpp2
-rw-r--r--src/gui/shop.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index f6c9c51c..bc76335f 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -50,7 +50,7 @@ BrowserBox::BrowserBox(unsigned int mode):
addMouseListener(this);
#ifdef USE_OPENGL
- if (config.getValue("opengl", 0)) {
+ if (config.getValue("opengl", 0.0f)) {
if (instances == 0) {
browserFont = new gcn::ImageFont(
"graphics/gui/browserfont.png",
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index ff6e3d68..62d18769 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -25,6 +25,8 @@
#include "../utils/dtor.h"
+#include <algorithm>
+
ShopItems::~ShopItems()
{
clear();