Made the OkDialog and ConfirmDialog classes proxies for their buttons' events. Removed the RequestTradeWindow class, replaced with a plain ConfirmDialog. Fixed a memory leak along the way.

2 files changed, 20 insertions, 6 deletions

diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 1a255e0b..7bf97b5f 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -141,8 +141,8 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                                      weightNotice = new OkDialog("Message",
                                              "You are carrying more then half your "
                                              "weight. You are unable to regain "
-                                             "health.",
-                                             &weightNoticeListener);
+                                             "health.");
+                                     weightNotice->addActionListener(&weightNoticeListener);
                                  }
                                  player_node->totalWeight = value;
                                  break;
@@ -163,8 +163,8 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                 if (player_node->hp == 0 && deathNotice == NULL)
                 {
                     deathNotice = new OkDialog("Message",
-                            "You're now dead, press ok to restart",
-                            &deathNoticeListener);
+                            "You're now dead, press ok to restart");
+                    deathNotice->addActionListener(&deathNoticeListener);
                     player_node->action = Being::DEAD;
                 }
             }
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index 6ed3bab2..5675fab8 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -30,11 +30,22 @@
 #include "../localplayer.h"
 
 #include "../gui/chat.h"
-#include "../gui/requesttrade.h"
+#include "../gui/confirm_dialog.h"
 #include "../gui/trade.h"
 
 std::string tradePartnerName;
 
+/**
+ * Listener for request trade dialogs
+ */
+struct RequestTradeListener : public gcn::ActionListener
+{
+    void action(const std::string& eventId)
+    {
+        player_node->tradeReply(eventId == "yes");
+    };
+} requestTradeListener;
+
 TradeHandler::TradeHandler()
 {
     static const Uint16 _messages[] = {
@@ -69,7 +80,10 @@ void TradeHandler::handleMessage(MessageIn *msg)
 
             player_node->setTrading(true);
             tradePartnerName = msg->readString(24);
-            new RequestTradeDialog(tradePartnerName);
+            ConfirmDialog *dlg = new ConfirmDialog("Request for trade",
+                    tradePartnerName +
+                    " wants to trade with you, do you accept?");
+            dlg->addActionListener(&requestTradeListener);
             break;
 
         case SMSG_TRADE_RESPONSE: