Merged the tmwserv client with the eAthena client

This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.

In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.

Conflicts:
	Everywhere!

1 files changed, 63 insertions, 82 deletions

diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp
index 96200add..60c51821 100644
--- a/src/net/partyhandler.cpp
+++ b/src/net/partyhandler.cpp
@@ -1,122 +1,103 @@
 /*
  *  The Mana World
- *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
+ *  Copyright 2008 The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  The Mana World is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  The Mana World is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
+ *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/actionlistener.hpp>
-
+#include <iostream>
 #include "partyhandler.h"
+
 #include "protocol.h"
 #include "messagein.h"
 
-#include "../gui/chat.h"
-#include "../gui/confirm_dialog.h"
+#include "chatserver/chatserver.h"
 
-#include "../beingmanager.h"
-#include "../party.h"
+#include "../gui/chat.h"
+#include "../gui/partywindow.h"
+#include "../log.h"
+#include "../localplayer.h"
 
-PartyHandler::PartyHandler(Party *party) : mParty(party)
+PartyHandler::PartyHandler()
 {
     static const Uint16 _messages[] = {
-        SMSG_PARTY_CREATE,
-        SMSG_PARTY_INFO,
-        SMSG_PARTY_INVITE,
-        SMSG_PARTY_INVITED,
-        SMSG_PARTY_SETTINGS,
-        SMSG_PARTY_MEMBER_INFO,
-        SMSG_PARTY_LEAVE,
-        SMSG_PARTY_UPDATE_HP,
-        SMSG_PARTY_UPDATE_COORDS,
-        SMSG_PARTY_MESSAGE,
+        CPMSG_PARTY_INVITE_RESPONSE,
+        CPMSG_PARTY_INVITED,
+        CPMSG_PARTY_ACCEPT_INVITE_RESPONSE,
+        CPMSG_PARTY_QUIT_RESPONSE,
+        CPMSG_PARTY_NEW_MEMBER,
+        CPMSG_PARTY_MEMBER_LEFT,
         0
     };
     handledMessages = _messages;
+
 }
 
-void PartyHandler::handleMessage(MessageIn *msg)
+void PartyHandler::handleMessage(MessageIn &msg)
 {
-    switch (msg->getId())
+    switch (msg.getId())
     {
-        case SMSG_PARTY_CREATE:
-            mParty->createResponse(msg->readInt8());
-            break;
-        case SMSG_PARTY_INFO:
-            break;
-        case SMSG_PARTY_INVITE:
+        case CPMSG_PARTY_INVITE_RESPONSE:
+        {
+            if (msg.readInt8() == ERRMSG_OK)
             {
-                std::string nick = msg->readString(24);
-                int status = msg->readInt8();
-                mParty->inviteResponse(nick, status);
-                break;
+
             }
-        case SMSG_PARTY_INVITED:
+        } break;
+
+        case CPMSG_PARTY_INVITED:
+        {
+            std::string inviter = msg.readString();
+            partyWindow->showPartyInvite(inviter);
+        } break;
+
+        case CPMSG_PARTY_ACCEPT_INVITE_RESPONSE:
+        {
+            if (msg.readInt8() == ERRMSG_OK)
             {
-                int id = msg->readInt32();
-                Being *being = beingManager->findBeing(id);
-                if (!being)
-                {
-                    break;
-                }
-                std::string nick;
-                int gender = 0;
-                std::string partyName = "";
-                if (being->getType() != Being::PLAYER)
-                {
-                    nick = "";
-                }
-                else
-                {
-                    nick = being->getName();
-                    gender = being->getGender();
-                    partyName = msg->readString(24);
-                }
-                mParty->invitedAsk(nick, gender, partyName);
-                break;
+                player_node->setInParty(true);
+                chatWindow->chatLog("Joined party");
             }
-        case SMSG_PARTY_SETTINGS:
-            break;
-        case SMSG_PARTY_MEMBER_INFO:
-            break;
-        case SMSG_PARTY_LEAVE:
+        }
+
+        case CPMSG_PARTY_QUIT_RESPONSE:
+        {
+            if (msg.readInt8() == ERRMSG_OK)
             {
-                /*int id = */msg->readInt32();
-                std::string nick = msg->readString(24);
-                /*int fail = */msg->readInt8();
-                mParty->leftResponse(nick);
-                break;
-            }
-        case SMSG_PARTY_UPDATE_HP:
-            break;
-        case SMSG_PARTY_UPDATE_COORDS:
-            break;
-        case SMSG_PARTY_MESSAGE:
-            { // new block to enable local variables
-                int msgLength = msg->readInt16() - 8;
-                if (msgLength <= 0)
-                {
-                    return;
-                }
-                int id = msg->readInt32();
-                Being *being = beingManager->findBeing(id);
-                std::string chatMsg = msg->readString(msgLength);
-                mParty->receiveChat(being, chatMsg);
+                player_node->setInParty(false);
             }
-            break;
+        } break;
+
+        case CPMSG_PARTY_NEW_MEMBER:
+        {
+            msg.readInt16(); // being id
+            std::string name = msg.readString();
+
+            chatWindow->chatLog(name + " joined the party");
+
+            if (!player_node->getInParty())
+                player_node->setInParty(true);
+
+            partyWindow->addPartyMember(name);
+        } break;
+
+        case CPMSG_PARTY_MEMBER_LEFT:
+        {
+            partyWindow->removePartyMember(msg.readString());
+        } break;
     }
 }