Move all TMWServ-specific code to net/tmwserv

Also fix several instances where the same net handler was being used for
both servers, and a few other related oddities.

1 files changed, 0 insertions, 240 deletions

diff --git a/src/net/guildhandler.cpp b/src/net/guildhandler.cpp
deleted file mode 100644
index cf886ab3..00000000
--- a/src/net/guildhandler.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- *  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 <iostream>
-#include "guildhandler.h"
-
-#include "protocol.h"
-#include "messagein.h"
-
-#include "chatserver/chatserver.h"
-#include "chatserver/guild.h"
-
-#include "../gui/guildwindow.h"
-#include "../gui/chat.h"
-#include "../guild.h"
-#include "../log.h"
-#include "../localplayer.h"
-#include "../channel.h"
-#include "../channelmanager.h"
-
-GuildHandler::GuildHandler()
-{
-    static const Uint16 _messages[] = {
-        CPMSG_GUILD_CREATE_RESPONSE,
-        CPMSG_GUILD_INVITE_RESPONSE,
-        CPMSG_GUILD_ACCEPT_RESPONSE,
-        CPMSG_GUILD_GET_MEMBERS_RESPONSE,
-        CPMSG_GUILD_UPDATE_LIST,
-        CPMSG_GUILD_INVITED,
-        CPMSG_GUILD_REJOIN,
-        CPMSG_GUILD_QUIT_RESPONSE,
-        0
-    };
-    handledMessages = _messages;
-
-}
-
-void GuildHandler::handleMessage(MessageIn &msg)
-{
-    switch (msg.getId())
-    {
-        case CPMSG_GUILD_CREATE_RESPONSE:
-        {
-            logger->log("Received CPMSG_GUILD_CREATE_RESPONSE");
-            if(msg.readInt8() == ERRMSG_OK)
-            {
-                // TODO - Acknowledge guild was created
-                chatWindow->chatLog("Guild created.");
-                joinedGuild(msg);
-            }
-            else
-            {
-                chatWindow->chatLog("Error creating guild.");
-            }
-        } break;
-
-        case CPMSG_GUILD_INVITE_RESPONSE:
-        {
-            logger->log("Received CPMSG_GUILD_INVITE_RESPONSE");
-            if(msg.readInt8() == ERRMSG_OK)
-            {
-                // TODO - Acknowledge invite was sent
-                chatWindow->chatLog("Invite sent.");
-            }
-        } break;
-
-        case CPMSG_GUILD_ACCEPT_RESPONSE:
-        {
-            logger->log("Received CPMSG_GUILD_ACCEPT_RESPONSE");
-            if(msg.readInt8() == ERRMSG_OK)
-            {
-                // TODO - Acknowledge accepted into guild
-                joinedGuild(msg);
-            }
-        } break;
-
-        case CPMSG_GUILD_GET_MEMBERS_RESPONSE:
-        {
-            logger->log("Received CPMSG_GUILD_GET_MEMBERS_RESPONSE");
-            if(msg.readInt8() == ERRMSG_OK)
-            {
-                std::string guildMember;
-                bool online;
-                std::string guildName;
-                Guild *guild;
-
-                short guildId = msg.readInt16();
-                guild = player_node->getGuild(guildId);
-
-                if (!guild)
-                    return;
-
-                guildName = guild->getName();
-
-                while(msg.getUnreadLength())
-                {
-                    guildMember = msg.readString();
-                    online = msg.readInt8();
-                    if(guildMember != "")
-                    {
-                        guild->addMember(guildMember);
-                        guildWindow->setOnline(guildName, guildMember, online);
-                    }
-                }
-
-                guildWindow->updateTab();
-            }
-        } break;
-
-        case CPMSG_GUILD_UPDATE_LIST:
-        {
-            logger->log("Received CPMSG_GUILD_UPDATE_LIST");
-            short guildId = msg.readInt16();
-            std::string guildMember = msg.readString();
-            char eventId = msg.readInt8();
-
-            Guild *guild = player_node->getGuild(guildId);
-            if (guild)
-            {
-                switch(eventId)
-                {
-                    case GUILD_EVENT_NEW_PLAYER:
-                        guild->addMember(guildMember);
-                        guildWindow->setOnline(guild->getName(), guildMember, true);
-                        break;
-
-                    case GUILD_EVENT_LEAVING_PLAYER:
-                        guild->removeMember(guildMember);
-                        break;
-
-                    case GUILD_EVENT_ONLINE_PLAYER:
-                        guildWindow->setOnline(guild->getName(), guildMember, true);
-                        break;
-
-                    case GUILD_EVENT_OFFLINE_PLAYER:
-                        guildWindow->setOnline(guild->getName(), guildMember, false);
-                        break;
-
-                    default:
-                        logger->log("Invalid guild event");
-                }
-            }
-            guildWindow->updateTab();
-
-
-        } break;
-
-        case CPMSG_GUILD_INVITED:
-        {
-            logger->log("Received CPMSG_GUILD_INVITED");
-            std::string inviterName = msg.readString();
-            std::string guildName = msg.readString();
-
-            // Open a dialog asking if the player accepts joining the guild.
-            guildWindow->openAcceptDialog(inviterName, guildName);
-        } break;
-
-        case CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE:
-        {
-            logger->log("Received CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE");
-
-            if (msg.readInt8() == ERRMSG_OK)
-            {
-                // promotion succeeded
-                chatWindow->chatLog("Member was promoted successfully");
-            }
-            else
-            {
-                // promotion failed
-                chatWindow->chatLog("Failed to promote member");
-            }
-        }
-
-        case CPMSG_GUILD_REJOIN:
-        {
-            logger->log("Received CPMSG_GUILD_REJOIN");
-
-            joinedGuild(msg);
-        } break;
-
-        case CPMSG_GUILD_QUIT_RESPONSE:
-        {
-            logger->log("Received CPMSG_GUILD_QUIT_RESPONSE");
-
-            if (msg.readInt8() == ERRMSG_OK)
-            {
-                // Must remove tab first, as it wont find the guild
-                // name after its removed from the player
-                int guildId = msg.readInt16();
-                Guild *guild = player_node->getGuild(guildId);
-                if (guild)
-                {
-                    chatWindow->removeChannel(guild->getName());
-                    guildWindow->removeTab(guildId);
-                    player_node->removeGuild(guildId);
-                }
-            }
-        } break;
-    }
-}
-
-void GuildHandler::joinedGuild(MessageIn &msg)
-{
-    std::string guildName = msg.readString();
-    short guildId = msg.readInt16();
-    short permissions = msg.readInt16();
-    short channelId = msg.readInt16();
-    std::string announcement = msg.readString();
-
-    // Add guild to player and create new guild tab
-    Guild *guild = player_node->addGuild(guildId, permissions);
-    guild->setName(guildName);
-    guildWindow->newGuildTab(guildName);
-    guildWindow->requestMemberList(guildId);
-
-    // Automatically create the guild channel
-    // COMMENT: Should this go here??
-    Channel *channel = new Channel(channelId, guildName, announcement);
-    channelManager->addChannel(channel);
-    chatWindow->createNewChannelTab(guildName);
-    chatWindow->chatLog("Topic: " + announcement, BY_CHANNEL, guildName);
-}