From e6e9b2c524f28e18f7efa582ee0dd0ee1e1420df Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 27 Aug 2015 21:26:15 +0300 Subject: Move receive code from npchandler into separate file. --- src/net/ea/npchandler.cpp | 182 +------------------------------------- src/net/ea/npchandler.h | 20 ----- src/net/ea/npcrecv.cpp | 217 ++++++++++++++++++++++++++++++++++++++++++++++ src/net/ea/npcrecv.h | 55 ++++++++++++ 4 files changed, 276 insertions(+), 198 deletions(-) create mode 100644 src/net/ea/npcrecv.cpp create mode 100644 src/net/ea/npcrecv.h (limited to 'src/net/ea') diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp index 2224de3e0..78ed6de53 100644 --- a/src/net/ea/npchandler.cpp +++ b/src/net/ea/npchandler.cpp @@ -28,6 +28,8 @@ #include "net/messagein.h" +#include "net/ea/npcrecv.h" + #include "utils/langs.h" #include "debug.h" @@ -35,186 +37,10 @@ namespace Ea { -NpcDialog *NpcHandler::mDialog = nullptr; -bool NpcHandler::mRequestLang = false; - NpcHandler::NpcHandler() { - mDialog = nullptr; - mRequestLang = false; -} - -void NpcHandler::processNpcChoice(Net::MessageIn &msg) -{ - npcHandler->getNpc(msg); - mRequestLang = false; - - if (mDialog) - { - mDialog->choiceRequest(); - mDialog->parseListItems(msg.readString(msg.getLength() - 8, - "select items")); - } - else - { - msg.readString(msg.getLength() - 8, "select items"); - } -} - -void NpcHandler::processNpcMessage(Net::MessageIn &msg) -{ - npcHandler->getNpc(msg); - mRequestLang = false; - - const std::string message = msg.readString(msg.getLength() - 8, "message"); - // ignore future legacy npc commands. - if (message.size() > 3 && message.substr(0, 3) == "###") - return; - if (mDialog) - mDialog->addText(message); -} - -void NpcHandler::processNpcClose(Net::MessageIn &msg) -{ - // Show the close button - npcHandler->getNpc(msg); - mRequestLang = false; - if (mDialog) - mDialog->showCloseButton(); -} - -void NpcHandler::processNpcNext(Net::MessageIn &msg) -{ - // Show the next button - npcHandler->getNpc(msg); - mRequestLang = false; - if (mDialog) - mDialog->showNextButton(); -} - -void NpcHandler::processNpcIntInput(Net::MessageIn &msg) -{ - // Request for an integer - npcHandler->getNpc(msg); - mRequestLang = false; - if (mDialog) - mDialog->integerRequest(0); -} - -void NpcHandler::processNpcStrInput(Net::MessageIn &msg) -{ - // Request for a string - BeingId npcId = npcHandler->getNpc(msg); - if (mRequestLang) - { - mRequestLang = false; - npcHandler->stringInput(npcId, getLangSimple()); - } - else if (mDialog) - { - mDialog->textRequest(""); - } -} - -void NpcHandler::processNpcCommand(Net::MessageIn &msg) -{ - const BeingId npcId = npcHandler->getNpc(msg); - mRequestLang = false; - - const int cmd = msg.readInt16("cmd"); - const BeingId id = msg.readBeingId("id"); - const int x = msg.readInt16("x"); - const int y = msg.readInt16("y"); - switch (cmd) - { - case 0: - mRequestLang = true; - break; - - case 1: - if (viewport) - viewport->moveCameraToActor(npcId); - break; - - case 2: - if (viewport) - { - if (id == BeingId_zero) - viewport->moveCameraToPosition(x, y); - else - viewport->moveCameraToActor(id, x, y); - } - break; - - case 3: - if (viewport) - viewport->returnCamera(); - break; - - case 4: - if (viewport) - { - viewport->moveCameraRelative(x, y); - } - break; - case 5: // close dialog - if (mDialog) - mDialog->restoreCamera(); - npcHandler->closeDialog(npcId); - break; - case 6: // show avatar - if (mDialog) - { - mDialog->showAvatar(fromInt(id, BeingTypeId)); - } - break; - case 7: // set avatar direction - if (mDialog) - { - mDialog->setAvatarDirection( - Net::MessageIn::fromServerDirection( - static_cast(id))); - } - break; - case 8: // set avatar action - if (mDialog) - mDialog->setAvatarAction(toInt(id, int)); - break; - case 9: // clear npc dialog - if (mDialog) - mDialog->clearRows(); - break; - case 10: // send selected item id - { - int invSize = toInt(id, int); - if (!invSize) - invSize = 1; - if (mDialog) - mDialog->itemRequest(invSize); - break; - } - case 11: // send selected item index - { - int invSize = toInt(id, int); - if (!invSize) - invSize = 1; - if (mDialog) - mDialog->itemIndexRequest(invSize); - break; - } - default: - UNIMPLIMENTEDPACKET; - break; - } -} - -void NpcHandler::processChangeTitle(Net::MessageIn &msg) -{ - npcHandler->getNpc(msg); - mRequestLang = false; - const std::string str = msg.readString(-1, "title"); - if (mDialog) - mDialog->setCaption(str); + NpcRecv::mDialog = nullptr; + NpcRecv::mRequestLang = false; } } // namespace Ea diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h index 28a423c39..98321d29f 100644 --- a/src/net/ea/npchandler.h +++ b/src/net/ea/npchandler.h @@ -44,26 +44,6 @@ class NpcHandler notfinal : public Net::NpcHandler protected: NpcHandler(); - - static void processNpcChoice(Net::MessageIn &msg); - - static void processNpcMessage(Net::MessageIn &msg); - - static void processNpcClose(Net::MessageIn &msg); - - static void processNpcNext(Net::MessageIn &msg); - - static void processNpcIntInput(Net::MessageIn &msg); - - static void processNpcStrInput(Net::MessageIn &msg); - - static void processNpcCommand(Net::MessageIn &msg); - - static void processChangeTitle(Net::MessageIn &msg); - - static NpcDialog *mDialog; - - static bool mRequestLang; }; } // namespace Ea diff --git a/src/net/ea/npcrecv.cpp b/src/net/ea/npcrecv.cpp new file mode 100644 index 000000000..08d0ed498 --- /dev/null +++ b/src/net/ea/npcrecv.cpp @@ -0,0 +1,217 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-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/npcrecv.h" + +#include "gui/viewport.h" + +#include "gui/windows/npcdialog.h" + +#include "net/messagein.h" + +#include "utils/langs.h" + +#include "debug.h" + +namespace Ea +{ + +namespace NpcRecv +{ + NpcDialog *mDialog = nullptr; + bool mRequestLang = false; +} // namespace NpcRecv + +void NpcRecv::processNpcChoice(Net::MessageIn &msg) +{ + npcHandler->getNpc(msg); + mRequestLang = false; + + if (mDialog) + { + mDialog->choiceRequest(); + mDialog->parseListItems(msg.readString(msg.getLength() - 8, + "select items")); + } + else + { + msg.readString(msg.getLength() - 8, "select items"); + } +} + +void NpcRecv::processNpcMessage(Net::MessageIn &msg) +{ + npcHandler->getNpc(msg); + mRequestLang = false; + + const std::string message = msg.readString(msg.getLength() - 8, "message"); + // ignore future legacy npc commands. + if (message.size() > 3 && message.substr(0, 3) == "###") + return; + if (mDialog) + mDialog->addText(message); +} + +void NpcRecv::processNpcClose(Net::MessageIn &msg) +{ + // Show the close button + npcHandler->getNpc(msg); + mRequestLang = false; + if (mDialog) + mDialog->showCloseButton(); +} + +void NpcRecv::processNpcNext(Net::MessageIn &msg) +{ + // Show the next button + npcHandler->getNpc(msg); + mRequestLang = false; + if (mDialog) + mDialog->showNextButton(); +} + +void NpcRecv::processNpcIntInput(Net::MessageIn &msg) +{ + // Request for an integer + npcHandler->getNpc(msg); + mRequestLang = false; + if (mDialog) + mDialog->integerRequest(0); +} + +void NpcRecv::processNpcStrInput(Net::MessageIn &msg) +{ + // Request for a string + BeingId npcId = npcHandler->getNpc(msg); + if (mRequestLang) + { + mRequestLang = false; + npcHandler->stringInput(npcId, getLangSimple()); + } + else if (mDialog) + { + mDialog->textRequest(""); + } +} + +void NpcRecv::processNpcCommand(Net::MessageIn &msg) +{ + const BeingId npcId = npcHandler->getNpc(msg); + mRequestLang = false; + + const int cmd = msg.readInt16("cmd"); + const BeingId id = msg.readBeingId("id"); + const int x = msg.readInt16("x"); + const int y = msg.readInt16("y"); + switch (cmd) + { + case 0: + mRequestLang = true; + break; + + case 1: + if (viewport) + viewport->moveCameraToActor(npcId); + break; + + case 2: + if (viewport) + { + if (id == BeingId_zero) + viewport->moveCameraToPosition(x, y); + else + viewport->moveCameraToActor(id, x, y); + } + break; + + case 3: + if (viewport) + viewport->returnCamera(); + break; + + case 4: + if (viewport) + { + viewport->moveCameraRelative(x, y); + } + break; + case 5: // close dialog + if (mDialog) + mDialog->restoreCamera(); + npcHandler->closeDialog(npcId); + break; + case 6: // show avatar + if (mDialog) + { + mDialog->showAvatar(fromInt(id, BeingTypeId)); + } + break; + case 7: // set avatar direction + if (mDialog) + { + mDialog->setAvatarDirection( + Net::MessageIn::fromServerDirection( + static_cast(id))); + } + break; + case 8: // set avatar action + if (mDialog) + mDialog->setAvatarAction(toInt(id, int)); + break; + case 9: // clear npc dialog + if (mDialog) + mDialog->clearRows(); + break; + case 10: // send selected item id + { + int invSize = toInt(id, int); + if (!invSize) + invSize = 1; + if (mDialog) + mDialog->itemRequest(invSize); + break; + } + case 11: // send selected item index + { + int invSize = toInt(id, int); + if (!invSize) + invSize = 1; + if (mDialog) + mDialog->itemIndexRequest(invSize); + break; + } + default: + UNIMPLIMENTEDPACKET; + break; + } +} + +void NpcRecv::processChangeTitle(Net::MessageIn &msg) +{ + npcHandler->getNpc(msg); + mRequestLang = false; + const std::string str = msg.readString(-1, "title"); + if (mDialog) + mDialog->setCaption(str); +} + +} // namespace Ea diff --git a/src/net/ea/npcrecv.h b/src/net/ea/npcrecv.h new file mode 100644 index 000000000..eb1808465 --- /dev/null +++ b/src/net/ea/npcrecv.h @@ -0,0 +1,55 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-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_NPCRECV_H +#define NET_EA_NPCRECV_H + +#include "net/npchandler.h" + +#include "localconsts.h" + +class NpcDialog; + +namespace Net +{ + class MessageIn; +} + +namespace Ea +{ + namespace NpcRecv + { + extern NpcDialog *mDialog; + extern bool mRequestLang; + + void processNpcChoice(Net::MessageIn &msg); + void processNpcMessage(Net::MessageIn &msg); + void processNpcClose(Net::MessageIn &msg); + void processNpcNext(Net::MessageIn &msg); + void processNpcIntInput(Net::MessageIn &msg); + void processNpcStrInput(Net::MessageIn &msg); + void processNpcCommand(Net::MessageIn &msg); + void processChangeTitle(Net::MessageIn &msg); + } // namespace NpcRecv +} // namespace Ea + +#endif // NET_EA_NPCRECV_H -- cgit v1.2.3-70-g09d2