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!

8 files changed, 564 insertions, 0 deletions

diff --git a/src/net/chatserver/chatserver.cpp b/src/net/chatserver/chatserver.cpp
new file mode 100644
index 00000000..94e36b94
--- /dev/null
+++ b/src/net/chatserver/chatserver.cpp
@@ -0,0 +1,146 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  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.
+ *
+ *  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 The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "chatserver.h"
+
+#include "internal.h"
+
+#include "../connection.h"
+#include "../messageout.h"
+#include "../protocol.h"
+
+using Net::ChatServer::connection;
+
+void Net::ChatServer::connect(Net::Connection *connection,
+        const std::string &token)
+{
+    Net::ChatServer::connection = connection;
+
+    MessageOut msg(PCMSG_CONNECT);
+
+    msg.writeString(token, 32);
+
+    connection->send(msg);
+}
+
+void Net::ChatServer::logout()
+{
+    MessageOut msg(PCMSG_DISCONNECT);
+
+    connection->send(msg);
+}
+
+void Net::ChatServer::chat(short channel, const std::string &text)
+{
+    MessageOut msg(PCMSG_CHAT);
+
+    msg.writeString(text);
+    msg.writeInt16(channel);
+
+    connection->send(msg);
+}
+
+void Net::ChatServer::announce(const std::string &text)
+{
+    MessageOut msg(PCMSG_ANNOUNCE);
+
+    msg.writeString(text);
+
+    connection->send(msg);
+}
+
+void Net::ChatServer::privMsg(const std::string &recipient,
+        const std::string &text)
+{
+    MessageOut msg(PCMSG_PRIVMSG);
+
+    msg.writeString(recipient);
+    msg.writeString(text);
+
+    connection->send(msg);
+}
+
+void Net::ChatServer::enterChannel(const std::string &channel, const std::string &password)
+{
+    MessageOut msg(PCMSG_ENTER_CHANNEL);
+
+    msg.writeString(channel);
+    msg.writeString(password);
+
+    connection->send(msg);
+}
+
+void Net::ChatServer::quitChannel(short channel)
+{
+    MessageOut msg(PCMSG_QUIT_CHANNEL);
+
+    msg.writeInt16(channel);
+
+    connection->send(msg);
+}
+
+void Net::ChatServer::getChannelList()
+{
+    MessageOut msg(PCMSG_LIST_CHANNELS);
+
+    connection->send(msg);
+}
+
+void Net::ChatServer::getUserList(const std::string &channel)
+{
+    MessageOut msg(PCMSG_LIST_CHANNELUSERS);
+
+    msg.writeString(channel);
+
+    connection->send(msg);
+}
+
+void Net::ChatServer::setChannelTopic(short channel, const std::string &topic)
+{
+    MessageOut msg(PCMSG_TOPIC_CHANGE);
+
+    msg.writeInt16(channel);
+    msg.writeString(topic);
+
+    connection->send(msg);
+}
+
+void Net::ChatServer::setUserMode(short channel, const std::string &user,
+                                  unsigned char mode)
+{
+    MessageOut msg(PCMSG_USER_MODE);
+
+    msg.writeInt16(channel);
+    msg.writeString(user);
+    msg.writeInt8(mode);
+
+    connection->send(msg);
+}
+
+void Net::ChatServer::kickUser(short channel, const std::string &user)
+{
+    MessageOut msg(PCMSG_KICK_USER);
+
+    msg.writeInt16(channel);
+    msg.writeString(user);
+
+    connection->send(msg);
+}
diff --git a/src/net/chatserver/chatserver.h b/src/net/chatserver/chatserver.h
new file mode 100644
index 00000000..1129239a
--- /dev/null
+++ b/src/net/chatserver/chatserver.h
@@ -0,0 +1,60 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  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.
+ *
+ *  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 The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_NET_CHATSERVER_CHATSERVER_H
+#define _TMW_NET_CHATSERVER_CHATSERVER_H
+
+#include <iosfwd>
+
+namespace Net
+{
+    class Connection;
+
+    namespace ChatServer
+    {
+        void connect(Net::Connection *connection, const std::string &token);
+
+        void logout();
+
+        void chat(short channel, const std::string &text);
+
+        void announce(const std::string &text);
+
+        void privMsg(const std::string &recipient, const std::string &text);
+
+        void enterChannel(const std::string &channel, const std::string &password);
+
+        void quitChannel(short channel);
+
+        void getChannelList();
+
+        void getUserList(const std::string &channel);
+
+        void setChannelTopic(short channel, const std::string &topic);
+
+        void setUserMode(short channel, const std::string &user, unsigned char mode);
+
+        void kickUser(short channel, const std::string &user);
+
+    }
+}
+
+#endif
diff --git a/src/net/chatserver/guild.cpp b/src/net/chatserver/guild.cpp
new file mode 100644
index 00000000..042ff013
--- /dev/null
+++ b/src/net/chatserver/guild.cpp
@@ -0,0 +1,95 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  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.
+ *
+ *  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 The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#include "guild.h"
+
+#include "internal.h"
+
+#include "../connection.h"
+#include "../messageout.h"
+#include "../protocol.h"
+
+#include "../../log.h"
+
+void Net::ChatServer::Guild::createGuild(const std::string &name)
+{
+    logger->log("Sending PCMSG_GUILD_CREATE");
+    MessageOut msg(PCMSG_GUILD_CREATE);
+
+    msg.writeString(name);
+
+    Net::ChatServer::connection->send(msg);
+}
+
+void Net::ChatServer::Guild::invitePlayer(const std::string &name, short guildId)
+{
+    logger->log("Sending PCMSG_GUILD_INVITE");
+    MessageOut msg(PCMSG_GUILD_INVITE);
+
+    msg.writeInt16(guildId);
+    msg.writeString(name);
+
+    Net::ChatServer::connection->send(msg);
+}
+
+void Net::ChatServer::Guild::acceptInvite(const std::string &name)
+{
+    logger->log("Sending PCMSG_GUILD_ACCEPT");
+    MessageOut msg(PCMSG_GUILD_ACCEPT);
+
+    msg.writeString(name);
+
+    Net::ChatServer::connection->send(msg);
+}
+
+void Net::ChatServer::Guild::getGuildMembers(short guildId)
+{
+    logger->log("Sending PCMSG_GUILD_GET_MEMBERS");
+    MessageOut msg(PCMSG_GUILD_GET_MEMBERS);
+
+    msg.writeInt16(guildId);
+
+    Net::ChatServer::connection->send(msg);
+}
+
+void Net::ChatServer::Guild::promoteMember(const std::string &name,
+                                           short guildId, short level)
+{
+    logger->log("Sending PCMSG_GUILD_PROMOTE_MEMBER");
+    MessageOut msg(PCMSG_GUILD_PROMOTE_MEMBER);
+
+    msg.writeInt16(guildId);
+    msg.writeString(name);
+    msg.writeInt8(level);
+
+    Net::ChatServer::connection->send(msg);
+}
+
+void Net::ChatServer::Guild::quitGuild(short guildId)
+{
+    logger->log("Sending PCMSG_GUILD_QUIT");
+    MessageOut msg(PCMSG_GUILD_QUIT);
+
+    msg.writeInt16(guildId);
+
+    Net::ChatServer::connection->send(msg);
+}
diff --git a/src/net/chatserver/guild.h b/src/net/chatserver/guild.h
new file mode 100644
index 00000000..6c35be9f
--- /dev/null
+++ b/src/net/chatserver/guild.h
@@ -0,0 +1,69 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  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.
+ *
+ *  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 The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef _TMW_NET_CHATSERVER_GUILD_H
+#define _TMW_NET_CHATSERVER_GUILD_H
+
+#include <iosfwd>
+
+namespace Net
+{
+    namespace ChatServer
+    {
+        namespace Guild
+        {
+            /**
+             * Create guild.
+             */
+            void createGuild(const std::string &name);
+
+            /**
+             * Invite a player to your guild.
+             */
+            void invitePlayer(const std::string &name, short guildId);
+
+            /**
+             * Accept an invite another player has sent to join their guild.
+             */
+            void acceptInvite(const std::string &name);
+
+            /**
+             * Get a list of members in a guild.
+             */
+            void getGuildMembers(short guildId);
+
+            /**
+             * Promote guild member
+             */
+            void promoteMember(const std::string &name, short guildId,
+                               short level);
+
+            /**
+             * Quit guild.
+             */
+            void quitGuild(short guildId);
+        }
+    }
+}
+
+#endif
+
diff --git a/src/net/chatserver/internal.cpp b/src/net/chatserver/internal.cpp
new file mode 100644
index 00000000..0822d93d
--- /dev/null
+++ b/src/net/chatserver/internal.cpp
@@ -0,0 +1,32 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  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.
+ *
+ *  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 The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "internal.h"
+
+namespace Net
+{
+    class Connection;
+
+    namespace ChatServer
+    {
+        Connection *connection = 0;
+    }
+}
diff --git a/src/net/chatserver/internal.h b/src/net/chatserver/internal.h
new file mode 100644
index 00000000..b0f137c5
--- /dev/null
+++ b/src/net/chatserver/internal.h
@@ -0,0 +1,35 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  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.
+ *
+ *  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 The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_NET_CHATSERVER_INTERNAL_H
+#define _TMW_NET_CHATSERVER_INTERNAL_H
+
+namespace Net
+{
+    class Connection;
+
+    namespace ChatServer
+    {
+        extern Connection *connection;
+    }
+}
+
+#endif
diff --git a/src/net/chatserver/party.cpp b/src/net/chatserver/party.cpp
new file mode 100644
index 00000000..56eb57d2
--- /dev/null
+++ b/src/net/chatserver/party.cpp
@@ -0,0 +1,70 @@
+/*
+ *  The Mana World
+ *  Copyright 2008 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  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.
+ *
+ *  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 The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#include "party.h"
+
+#include "internal.h"
+
+#include "../connection.h"
+#include "../messageout.h"
+#include "../protocol.h"
+
+#include "../../log.h"
+
+void Net::ChatServer::Party::invitePlayer(const std::string &name)
+{
+    logger->log("Sending PCMSG_PARTY_INVITE");
+    MessageOut msg(PCMSG_PARTY_INVITE);
+
+    msg.writeString(name);
+
+    Net::ChatServer::connection->send(msg);
+}
+
+void Net::ChatServer::Party::acceptInvite(const std::string &name)
+{
+    logger->log("Sending PCMSG_PARTY_ACCEPT_INVITE");
+    MessageOut msg(PCMSG_PARTY_ACCEPT_INVITE);
+
+    msg.writeString(name);
+
+    Net::ChatServer::connection->send(msg);
+}
+
+void Net::ChatServer::Party::getPartyMembers()
+{
+    logger->log("Sending PCMSG_PARTY_GET_MEMBERS");
+//    MessageOut msg(PCMSG_GUILD_GET_MEMBERS);
+
+//    msg.writeInt16(guildId);
+
+//    Net::ChatServer::connection->send(msg);
+}
+
+void Net::ChatServer::Party::quitParty()
+{
+    logger->log("Sending PCMSG_PARTY_QUIT");
+    MessageOut msg(PCMSG_PARTY_QUIT);
+
+    Net::ChatServer::connection->send(msg);
+}
+
diff --git a/src/net/chatserver/party.h b/src/net/chatserver/party.h
new file mode 100644
index 00000000..c1febd66
--- /dev/null
+++ b/src/net/chatserver/party.h
@@ -0,0 +1,57 @@
+/*
+ *  The Mana World
+ *  Copyright 2008 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  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.
+ *
+ *  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 The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef _TMW_NET_CHATSERVER_PARTY_H
+#define _TMW_NET_CHATSERVER_PARTY_H
+
+#include <iosfwd>
+
+namespace Net
+{
+    namespace ChatServer
+    {
+        namespace Party
+        {
+            /**
+             * Invite a player to the party.
+             */
+            void invitePlayer(const std::string &name);
+
+            /**
+             * Accept an invite another player has sent to join their party
+             */
+            void acceptInvite(const std::string &name);
+
+            /**
+             * Get a list of party members
+             */
+            void getPartyMembers();
+
+            /**
+             * Leave party
+             */
+            void quitParty();
+        }
+    }
+}
+
+#endif