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.

1 files changed, 4 insertions, 4 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;
                 }
             }