From 653447ca463eaf573e7123896155b538b8dec869 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 26 Aug 2015 16:07:42 +0300 Subject: Move receive code from gamehandler into separate file. --- src/net/ea/gamehandler.cpp | 50 ++++++---------------------- src/net/ea/gamehandler.h | 10 ------ src/net/ea/gamerecv.cpp | 81 ++++++++++++++++++++++++++++++++++++++++++++++ src/net/ea/gamerecv.h | 48 +++++++++++++++++++++++++++ 4 files changed, 138 insertions(+), 51 deletions(-) create mode 100644 src/net/ea/gamerecv.cpp create mode 100644 src/net/ea/gamerecv.h (limited to 'src/net/ea') diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index 8f21edf8f..4f8734e92 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -34,6 +34,8 @@ #include "net/messagein.h" +#include "net/ea/gamerecv.h" + #include "utils/gettext.h" #include "debug.h" @@ -41,14 +43,11 @@ namespace Ea { -std::string GameHandler::mMap; -BeingId GameHandler::mCharID = BeingId_zero; - GameHandler::GameHandler() : Net::GameHandler() { - mMap.clear(); - mCharID = BeingId_zero; + GameRecv::mMap.clear(); + GameRecv::mCharID = BeingId_zero; } void GameHandler::who() const @@ -57,50 +56,19 @@ void GameHandler::who() const void GameHandler::setMap(const std::string &map) { - mMap = map.substr(0, map.rfind(".")); -} - -void GameHandler::processWhoAnswer(Net::MessageIn &msg) -{ - NotifyManager::notify(NotifyTypes::ONLINE_USERS, - msg.readInt32("users count")); -} - -void GameHandler::processCharSwitchResponse(Net::MessageIn &msg) -{ - if (msg.readUInt8("response")) - client->setState(STATE_SWITCH_CHARACTER); -} - -void GameHandler::processMapQuitResponse(Net::MessageIn &msg) -{ - if (msg.readUInt8("response")) - { - CREATEWIDGET(OkDialog, - // TRANSLATORS: error header - _("Game"), - // TRANSLATORS: error message - _("Request to quit denied!"), - // TRANSLATORS: ok dialog button - _("OK"), - DialogType::ERROR, - Modal_true, - ShowCenter_true, - nullptr, - 260); - } + GameRecv::mMap = map.substr(0, map.rfind(".")); } void GameHandler::clear() { - mMap.clear(); - mCharID = BeingId_zero; + GameRecv::mMap.clear(); + GameRecv::mCharID = BeingId_zero; } void GameHandler::initEngines() const { - if (!mMap.empty()) - Game::instance()->changeMap(mMap); + if (!GameRecv::mMap.empty()) + Game::instance()->changeMap(GameRecv::mMap); } } // namespace Ea diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h index ee1f12701..17834b333 100644 --- a/src/net/ea/gamehandler.h +++ b/src/net/ea/gamehandler.h @@ -55,16 +55,6 @@ class GameHandler notfinal : public Net::GameHandler void clear() override final; void initEngines() const override final; - - protected: - static void processWhoAnswer(Net::MessageIn &msg); - - static void processCharSwitchResponse(Net::MessageIn &msg); - - static void processMapQuitResponse(Net::MessageIn &msg); - - static std::string mMap; - static BeingId mCharID; // < Saved for map-server switching }; } // namespace Ea diff --git a/src/net/ea/gamerecv.cpp b/src/net/ea/gamerecv.cpp new file mode 100644 index 000000000..73fe3a01e --- /dev/null +++ b/src/net/ea/gamerecv.cpp @@ -0,0 +1,81 @@ +/* + * The ManaPlus Client + * Copyright (C) 2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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, see . + */ + +#include "net/ea/gamerecv.h" + +#include "client.h" +#include "game.h" +#include "notifymanager.h" + +#include "enums/resources/notifytypes.h" + +#include "gui/windows/okdialog.h" + +#include "gui/widgets/createwidget.h" + +#include "net/messagein.h" + +#include "utils/gettext.h" + +#include "debug.h" + +namespace Ea +{ + +namespace GameRecv +{ + std::string mMap; + BeingId mCharID = BeingId_zero; +} // namespace GameRev + +void GameRecv::processWhoAnswer(Net::MessageIn &msg) +{ + NotifyManager::notify(NotifyTypes::ONLINE_USERS, + msg.readInt32("users count")); +} + +void GameRecv::processCharSwitchResponse(Net::MessageIn &msg) +{ + if (msg.readUInt8("response")) + client->setState(STATE_SWITCH_CHARACTER); +} + +void GameRecv::processMapQuitResponse(Net::MessageIn &msg) +{ + if (msg.readUInt8("response")) + { + CREATEWIDGET(OkDialog, + // TRANSLATORS: error header + _("Game"), + // TRANSLATORS: error message + _("Request to quit denied!"), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, + Modal_true, + ShowCenter_true, + nullptr, + 260); + } +} + +} // namespace Ea diff --git a/src/net/ea/gamerecv.h b/src/net/ea/gamerecv.h new file mode 100644 index 000000000..a35b13825 --- /dev/null +++ b/src/net/ea/gamerecv.h @@ -0,0 +1,48 @@ +/* + * The ManaPlus Client + * Copyright (C) 2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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, see . + */ + +#ifndef NET_EA_GAMERECV_H +#define NET_EA_GAMERECV_H + +#include "enums/simpletypes/beingid.h" + +#include "net/gamehandler.h" + +namespace Net +{ + class MessageIn; +} + +namespace Ea +{ + namespace GameRecv + { + extern std::string mMap; + extern BeingId mCharID; // < Saved for map-server switching + + void processWhoAnswer(Net::MessageIn &msg); + void processCharSwitchResponse(Net::MessageIn &msg); + void processMapQuitResponse(Net::MessageIn &msg); + } // namespace GameRecv +} // namespace Ea + +#endif // NET_EA_GAMERECV_H -- cgit v1.2.3-60-g2f50