Added avatars to party window

1 files changed, 32 insertions, 14 deletions

diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp
index 484d81b0..1b963dae 100644
--- a/src/gui/partywindow.cpp
+++ b/src/gui/partywindow.cpp
@@ -24,51 +24,61 @@
 #include "partywindow.h"
 #include "chat.h"
 
+#include "widgets/avatar.h"
+
 #include "../utils/gettext.h"
 #include "../net/chatserver/party.h"
 
 PartyWindow::PartyWindow() : Window(_("Party"))
 {
     setVisible(false);
+    setResizable(false);
+    setCaption(_("Party"));
+    setCloseButton(true);
+    setMinWidth(110);
+    setMinHeight(200);
+    setDefaultSize(620, 300, 110, 200);
+
+    loadWindowState("Party");
 }
 
 PartyWindow::~PartyWindow()
 {
-    PartyList::iterator itr = mPartyMembers.begin(),
-                        itr_end = mPartyMembers.end();
-
-    while (itr != itr_end)
-    {
-        delete (*itr);
-    }
-
     mPartyMembers.clear();
 }
 
 void PartyWindow::draw(gcn::Graphics *graphics)
 {
-
+    Window::draw(graphics);
 }
 
 void PartyWindow::addPartyMember(const std::string &memberName)
 {
-    PartyMember *player = new PartyMember;
+    // check to see if player is already in the party
     PartyList::iterator itr = mPartyMembers.begin(),
                         itr_end = mPartyMembers.end();
 
     while (itr != itr_end)
     {
-        if ((*itr)->name == memberName)
+        if ((*itr).name == memberName)
         {
+            // already in the party, dont add
             return;
         }
         ++itr;
     }
 
-    player->name = memberName;
+    // create new party member
+    PartyMember player;
+    player.name = memberName;
     mPartyMembers.push_back(player);
 
-    if (mPartyMembers.size() > 1)
+    // add avatar of the new member to window
+    Avatar *avatar = new Avatar(memberName);
+    add(avatar, 0, (mPartyMembers.size() - 1)*14);
+
+    // show the window
+    if (mPartyMembers.size() > 0)
     {
         setVisible(true);
     }
@@ -76,12 +86,13 @@ void PartyWindow::addPartyMember(const std::string &memberName)
 
 void PartyWindow::removePartyMember(const std::string &memberName)
 {
+    // remove the party member
     PartyList::iterator itr = mPartyMembers.begin(),
                         itr_end = mPartyMembers.end();
 
     while (itr != itr_end)
     {
-        if ((*itr)->name == memberName)
+        if ((*itr).name == memberName)
         {
             mPartyMembers.erase(itr);
             break;
@@ -89,6 +100,7 @@ void PartyWindow::removePartyMember(const std::string &memberName)
         ++itr;
     }
 
+    // if no-one left, remove the party window
     if (mPartyMembers.size() < 1)
     {
         setVisible(false);
@@ -97,15 +109,19 @@ void PartyWindow::removePartyMember(const std::string &memberName)
 
 void PartyWindow::showPartyInvite(const std::string &inviter)
 {
+    // check there isnt already an invite showing
     if (mPartyInviter != "")
     {
         chatWindow->chatLog("Received party request, but one already exists",
                             BY_SERVER);
         return;
     }
+
+    // log invite
     std::string msg = inviter + " has invited you to join their party";
     chatWindow->chatLog(msg, BY_SERVER);
 
+    // show invite
     acceptDialog = new ConfirmDialog("Accept Party Invite", msg, this);
     acceptDialog->addActionListener(this);
 
@@ -116,8 +132,10 @@ void PartyWindow::action(const gcn::ActionEvent &event)
 {
     const std::string &eventId = event.getId();
 
+    // check if they accepted the invite
     if (eventId == "yes")
     {
+        chatWindow->chatLog("Accepted invite from " + mPartyInviter);
         Net::ChatServer::Party::acceptInvite(mPartyInviter);
         mPartyInviter = "";
     }