Merge login state machines for both clients

Also do some cleanup and refactoring of related code.

1 files changed, 0 insertions, 289 deletions

diff --git a/src/net/tmwserv/charserverhandler.cpp b/src/net/tmwserv/charserverhandler.cpp
deleted file mode 100644
index 93181a93..00000000
--- a/src/net/tmwserv/charserverhandler.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- *  The Mana World
- *  Copyright (C) 2004  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
- *  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,
- *  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
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "net/tmwserv/charserverhandler.h"
-
-#include "net/tmwserv/connection.h"
-#include "net/tmwserv/protocol.h"
-
-#include "net/tmwserv/accountserver/accountserver.h"
-#include "net/tmwserv/accountserver/account.h"
-
-#include "net/logindata.h"
-#include "net/messagein.h"
-
-#include "game.h"
-#include "localplayer.h"
-#include "log.h"
-#include "main.h"
-
-#include "gui/charcreatedialog.h"
-#include "gui/okdialog.h"
-
-#include "resources/colordb.h"
-
-#include "utils/gettext.h"
-
-extern Net::Connection *gameServerConnection;
-extern Net::Connection *chatServerConnection;
-
-Net::CharHandler *charHandler;
-
-namespace TmwServ {
-
-CharServerHandler::CharServerHandler():
-    mCharCreateDialog(0)
-{
-    static const Uint16 _messages[] = {
-        APMSG_CHAR_CREATE_RESPONSE,
-        APMSG_CHAR_DELETE_RESPONSE,
-        APMSG_CHAR_INFO,
-        APMSG_CHAR_SELECT_RESPONSE,
-        0
-    };
-    handledMessages = _messages;
-    charHandler = this;
-}
-
-void CharServerHandler::handleMessage(MessageIn &msg)
-{
-    int slot;
-    LocalPlayer *tempPlayer;
-
-    switch (msg.getId())
-    {
-        case APMSG_CHAR_CREATE_RESPONSE:
-            handleCharCreateResponse(msg);
-            break;
-
-        case APMSG_CHAR_DELETE_RESPONSE:
-        {
-            int errMsg = msg.readInt8();
-            // Character deletion successful
-            if (errMsg == ERRMSG_OK)
-            {
-                delete mCharInfo->getEntry();
-                mCharInfo->setEntry(0);
-                mCharInfo->unlock();
-                new OkDialog(_("Info"), _("Player deleted."));
-            }
-            // Character deletion failed
-            else
-            {
-                std::string errorMessage = "";
-                switch (errMsg)
-                {
-                    case ERRMSG_NO_LOGIN:
-                        errorMessage = _("Not logged in.");
-                        break;
-                    case ERRMSG_INVALID_ARGUMENT:
-                        errorMessage = _("Selection out of range.");
-                        break;
-                    default:
-                        errorMessage = _("Unknown error.");
-                }
-                mCharInfo->unlock();
-                new OkDialog(_("Error"), errorMessage);
-            }
-        }
-            break;
-
-        case APMSG_CHAR_INFO:
-            tempPlayer = readPlayerData(msg, slot);
-            mCharInfo->unlock();
-            mCharInfo->select(slot);
-            mCharInfo->setEntry(tempPlayer);
-
-            // Close the character create dialog
-            if (mCharCreateDialog)
-            {
-                mCharCreateDialog->scheduleDelete();
-                mCharCreateDialog = 0;
-            }
-            break;
-
-        case APMSG_CHAR_SELECT_RESPONSE:
-            handleCharSelectResponse(msg);
-            break;
-    }
-}
-
-void CharServerHandler::handleCharCreateResponse(MessageIn &msg)
-{
-    int errMsg = msg.readInt8();
-
-    // Character creation failed
-    if (errMsg != ERRMSG_OK)
-    {
-        std::string errorMessage = "";
-        switch (errMsg)
-        {
-            case ERRMSG_NO_LOGIN:
-                errorMessage = _("Not logged in.");
-                break;
-            case CREATE_TOO_MUCH_CHARACTERS:
-                errorMessage = _("No empty slot.");
-                break;
-            case ERRMSG_INVALID_ARGUMENT:
-                errorMessage = _("Invalid name.");
-                break;
-            case CREATE_EXISTS_NAME:
-                errorMessage = _("Character's name already exists.");
-                break;
-            case CREATE_INVALID_HAIRSTYLE:
-                errorMessage = _("Invalid hairstyle.");
-                break;
-            case CREATE_INVALID_HAIRCOLOR:
-                errorMessage = _("Invalid hair color.");
-                break;
-            case CREATE_INVALID_GENDER:
-                errorMessage = _("Invalid gender.");
-                break;
-            case CREATE_RAW_STATS_TOO_HIGH:
-                errorMessage = _("Character's stats are too high.");
-                break;
-            case CREATE_RAW_STATS_TOO_LOW:
-                errorMessage = _("Character's stats are too low.");
-                break;
-            case CREATE_RAW_STATS_EQUAL_TO_ZERO:
-                errorMessage = _("One stat is zero.");
-                break;
-            default:
-                errorMessage = _("Unknown error.");
-                break;
-        }
-        new OkDialog(_("Error"), errorMessage);
-    }
-
-    if (mCharCreateDialog)
-        mCharCreateDialog->unlock();
-}
-
-void CharServerHandler::handleCharSelectResponse(MessageIn &msg)
-{
-    int errMsg = msg.readInt8();
-
-    if (errMsg == ERRMSG_OK)
-    {
-        token = msg.readString(32);
-        std::string gameServer = msg.readString();
-        unsigned short gameServerPort = msg.readInt16();
-        std::string chatServer = msg.readString();
-        unsigned short chatServerPort = msg.readInt16();
-
-        logger->log("Game server: %s:%d", gameServer.c_str(), gameServerPort);
-        logger->log("Chat server: %s:%d", chatServer.c_str(), chatServerPort);
-
-        gameServerConnection->connect(gameServer, gameServerPort);
-        chatServerConnection->connect(chatServer, chatServerPort);
-
-        // Keep the selected character and delete the others
-        player_node = mCharInfo->getEntry();
-        int slot = mCharInfo->getPos();
-        mCharInfo->unlock();
-        mCharInfo->select(0);
-
-        do {
-            LocalPlayer *tmp = mCharInfo->getEntry();
-            if (tmp != player_node)
-            {
-                delete tmp;
-                mCharInfo->setEntry(0);
-            }
-            mCharInfo->next();
-        } while (mCharInfo->getPos());
-        mCharInfo->select(slot);
-
-        mCharInfo->clear(); //player_node will be deleted by ~Game
-
-        state = STATE_CONNECT_GAME;
-    }
-    else if(errMsg == ERRMSG_FAILURE)
-    {
-        errorMessage = _("No gameservers are available.");
-        mCharInfo->clear();
-        state = STATE_ERROR;
-    }
-}
-
-LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
-{
-    LocalPlayer *tempPlayer = new LocalPlayer;
-    slot = msg.readInt8(); // character slot
-    tempPlayer->setName(msg.readString());
-    tempPlayer->setGender(msg.readInt8() == GENDER_MALE ? GENDER_MALE : GENDER_FEMALE);
-    int hs = msg.readInt8(), hc = msg.readInt8();
-    tempPlayer->setSprite(Player::HAIR_SPRITE, hs * -1, ColorDB::get(hc));
-    tempPlayer->setLevel(msg.readInt16());
-    tempPlayer->setCharacterPoints(msg.readInt16());
-    tempPlayer->setCorrectionPoints(msg.readInt16());
-    tempPlayer->setMoney(msg.readInt32());
-
-    for (int i = 0; i < 7; i++)
-    {
-        tempPlayer->setAttributeBase(i, msg.readInt8());
-    }
-
-    return tempPlayer;
-}
-
-void CharServerHandler::setCharCreateDialog(CharCreateDialog *window)
-{
-    mCharCreateDialog = window;
-
-    if (!mCharCreateDialog) return;
-
-    std::vector<std::string> attributes;
-    attributes.push_back(_("Strength:"));
-    attributes.push_back(_("Agility:"));
-    attributes.push_back(_("Dexterity:"));
-    attributes.push_back(_("Vitality:"));
-    attributes.push_back(_("Intelligence:"));
-    attributes.push_back(_("Willpower:"));
-
-    mCharCreateDialog->setAttributes(attributes, 60, 1, 20);
-}
-
-void CharServerHandler::chooseCharacter(int slot, LocalPlayer* character)
-{
-    Net::AccountServer::Account::selectCharacter(slot);
-}
-
-void CharServerHandler::newCharacter(const std::string &name, int slot, bool gender,
-                  int hairstyle, int hairColor, std::vector<int> stats)
-{
-    Net::AccountServer::Account::createCharacter(name, hairstyle, hairColor,
-                    gender,
-                    stats[0],  // STR
-                    stats[1],  // AGI
-                    stats[2],  // DEX
-                    stats[3],  // VIT
-                    stats[4],  // INT
-                    stats[5]   // WILL
-                );
-}
-
-void CharServerHandler::deleteCharacter(int slot, LocalPlayer* character)
-{
-    Net::AccountServer::Account::deleteCharacter(slot);
-}
-
-} // namespace TmwServ