Moved many MessageOut constructions around

No real point in having these abstracted away twice. We're using network
interfaces now instead of functions structured in namespaces.

2 files changed, 1 insertions, 110 deletions

diff --git a/src/net/tmwserv/chatserver/chatserver.cpp b/src/net/tmwserv/chatserver/chatserver.cpp
index 49a17367..c35fc782 100644
--- a/src/net/tmwserv/chatserver/chatserver.cpp
+++ b/src/net/tmwserv/chatserver/chatserver.cpp
@@ -31,117 +31,24 @@
 using Net::ChatServer::connection;
 
 void Net::ChatServer::connect(Net::Connection *connection,
-        const std::string &token)
+                              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/tmwserv/chatserver/chatserver.h b/src/net/tmwserv/chatserver/chatserver.h
index 8a6025a7..18859a2c 100644
--- a/src/net/tmwserv/chatserver/chatserver.h
+++ b/src/net/tmwserv/chatserver/chatserver.h
@@ -34,24 +34,8 @@ namespace Net
 
         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);
 
     }