Added party invite dialog

3 files changed, 9 insertions, 6 deletions

diff --git a/src/net/chatserver/party.cpp b/src/net/chatserver/party.cpp
index 63e2ddf9..ff465924 100644
--- a/src/net/chatserver/party.cpp
+++ b/src/net/chatserver/party.cpp
@@ -44,12 +44,12 @@ void Net::ChatServer::Party::invitePlayer(const std::string &name)
 
 void Net::ChatServer::Party::acceptInvite(const std::string &name)
 {
-    logger->log("Sending PCMSG_PARTY_ACCEPT");
-//    MessageOut msg(PCMSG_GUILD_ACCEPT);
+    logger->log("Sending PCMSG_PARTY_ACCEPT_INVITE");
+    MessageOut msg(PCMSG_PARTY_ACCEPT_INVITE);
 
-//    msg.writeString(name);
+    msg.writeString(name);
 
-//    Net::ChatServer::connection->send(msg);
+    Net::ChatServer::connection->send(msg);
 }
 
 void Net::ChatServer::Party::getPartyMembers()
diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp
index dd169b8d..f3a2e2f5 100644
--- a/src/net/partyhandler.cpp
+++ b/src/net/partyhandler.cpp
@@ -30,6 +30,7 @@
 #include "chatserver/chatserver.h"
 
 #include "../gui/chat.h"
+#include "../gui/partywindow.h"
 #include "../log.h"
 #include "../localplayer.h"
 
@@ -56,13 +57,15 @@ void PartyHandler::handleMessage(MessageIn &msg)
             {
                 if (!player_node->getInParty())
                     player_node->setInParty(true);
+                std::string memberName = msg.readString();
+                partyWindow->addPartyMember(memberName);
             }
         } break;
 
         case CPMSG_PARTY_INVITED:
         {
-            //TODO: Show dialog to player asking to join party
             std::string inviter = msg.readString();
+            partyWindow->showPartyInvite(inviter);
         } break;
 
         case CPMSG_PARTY_ACCEPT_INVITE_RESPONSE:
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 201bf717..d2d5937d 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -147,7 +147,7 @@ enum {
 
     // Party
     PCMSG_PARTY_INVITE                  = 0x03A0, // S name
-    CPMSG_PARTY_INVITE_RESPONSE         = 0x03A1, // B error
+    CPMSG_PARTY_INVITE_RESPONSE         = 0x03A1, // B error, S name
     CPMSG_PARTY_INVITED                 = 0x03A2, // S name
     PCMSG_PARTY_ACCEPT_INVITE           = 0x03A5, // S name
     CPMSG_PARTY_ACCEPT_INVITE_RESPONSE  = 0x03A6, // B error