Fixed compilation errors and trade bug.

4 files changed, 13 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 3104f53e..419e4e4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-14  David Athay  <ko2fan@gmail.com>
+
+	* src/gui/shop.cpp, src/gui/browserbox.cpp, src/net/tradehandler.cpp: Fixed 
+	compilation errors. Fixed trade bug (although a little hacky right now).
+
 2008-06-08  Fate  <fate.tmw@googlemail.com>
 
 	* src/gui/table.cpp: Invalidate mTopWidget whenever the model is
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();
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index 85ab65c1..ed1536eb 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -159,6 +159,11 @@ void TradeHandler::handleMessage(MessageIn *msg)
             // Trade: New Item add response (was 0x00ea, now 01b1)
             {
                 const int index = msg->readInt16();
+                if (index == 0)
+                {
+                    tradeWindow->receivedOk(true);
+                    return;
+                }
                 Item *item = player_node->getInventory()->getItem(index);
                 Sint16 quantity = msg->readInt16();