From bff3a68b9f8984f0e8c1c530a26927b33b5afad1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 30 Aug 2015 15:38:03 +0300 Subject: Move receive code from questhandler into separate file. --- src/CMakeLists.txt | 4 + src/Makefile.am | 4 + src/net/eathena/questhandler.cpp | 139 ++-------------------------------- src/net/eathena/questhandler.h | 15 ---- src/net/eathena/questrecv.cpp | 160 +++++++++++++++++++++++++++++++++++++++ src/net/eathena/questrecv.h | 42 ++++++++++ src/net/tmwa/questhandler.cpp | 37 +-------- src/net/tmwa/questhandler.h | 4 - src/net/tmwa/questrecv.cpp | 67 ++++++++++++++++ src/net/tmwa/questrecv.h | 37 +++++++++ 10 files changed, 325 insertions(+), 184 deletions(-) create mode 100644 src/net/eathena/questrecv.cpp create mode 100644 src/net/eathena/questrecv.h create mode 100644 src/net/tmwa/questrecv.cpp create mode 100644 src/net/tmwa/questrecv.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4b2990385..e85b76512 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1475,6 +1475,8 @@ SET(SRCS_TMWA net/tmwa/protocol.h net/tmwa/questhandler.cpp net/tmwa/questhandler.h + net/tmwa/questrecv.cpp + net/tmwa/questrecv.h net/tmwa/serverfeatures.cpp net/tmwa/serverfeatures.h net/tmwa/skillhandler.cpp @@ -1692,6 +1694,8 @@ SET(SRCS_EATHENA net/eathena/protocol.h net/eathena/questhandler.cpp net/eathena/questhandler.h + net/eathena/questrecv.cpp + net/eathena/questrecv.h net/eathena/roulettehandler.cpp net/eathena/roulettehandler.h net/eathena/searchstorehandler.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 80a877368..108ccf831 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1318,6 +1318,8 @@ manaplus_SOURCES += \ net/tmwa/protocol.h \ net/tmwa/questhandler.cpp \ net/tmwa/questhandler.h \ + net/tmwa/questrecv.cpp \ + net/tmwa/questrecv.h \ net/tmwa/serverfeatures.cpp \ net/tmwa/serverfeatures.h \ net/tmwa/skillhandler.cpp \ @@ -1538,6 +1540,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \ net/eathena/protocol.h \ net/eathena/questhandler.cpp \ net/eathena/questhandler.h \ + net/eathena/questrecv.cpp \ + net/eathena/questrecv.h \ net/eathena/roulettehandler.cpp \ net/eathena/roulettehandler.h \ net/eathena/searchstorehandler.cpp \ diff --git a/src/net/eathena/questhandler.cpp b/src/net/eathena/questhandler.cpp index 404069594..db70958a4 100644 --- a/src/net/eathena/questhandler.cpp +++ b/src/net/eathena/questhandler.cpp @@ -25,6 +25,7 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" +#include "net/eathena/questrecv.h" #include "resources/skillconsts.h" @@ -58,31 +59,31 @@ void QuestHandler::handleMessage(Net::MessageIn &msg) switch (msg.getId()) { case SMSG_QUEST_ADD: - processAddQuest(msg); + QuestRecv::processAddQuest(msg); break; case SMSG_QUEST_LIST: - processAddQuests(msg); + QuestRecv::processAddQuests(msg); break; case SMSG_QUEST_LIST_OBJECTIVES: - processAddQuestsObjectives(msg); + QuestRecv::processAddQuestsObjectives(msg); break; case SMSG_QUEST_UPDATE_OBJECTIVES: - processUpdateQuestsObjectives(msg); + QuestRecv::processUpdateQuestsObjectives(msg); break; case SMSG_QUEST_REMOVE: - processRemoveQuest(msg); + QuestRecv::processRemoveQuest(msg); break; case SMSG_QUEST_ACTIVATE: - processActivateQuest(msg); + QuestRecv::processActivateQuest(msg); break; case SMSG_QUEST_NPC_EFFECT: - processNpcQuestEffect(msg); + QuestRecv::processNpcQuestEffect(msg); break; default: @@ -91,130 +92,6 @@ void QuestHandler::handleMessage(Net::MessageIn &msg) BLOCK_END("QuestHandler::handleMessage") } -void QuestHandler::processAddQuest(Net::MessageIn &msg) -{ - const int var = msg.readInt32("quest id"); - const int val = msg.readUInt8("state"); - msg.readUInt8("time diff"); - msg.readInt32("time"); - const int num = msg.readInt16("objectives count"); - for (int f = 0; f < num; f ++) - { - // need use in quests kills list - msg.readInt32("monster id"); - msg.readInt16("count"); - msg.readString(24, "monster name"); - } - - msg.skipToEnd("unused"); - - if (questsWindow) - { - questsWindow->updateQuest(var, val); - questsWindow->rebuild(true); - } - if (skillDialog) - { - skillDialog->updateQuest(var, val); - skillDialog->playUpdateEffect(var + SKILL_VAR_MIN_ID); - } -} - -void QuestHandler::processAddQuests(Net::MessageIn &msg) -{ - msg.readInt16("len"); - const int num = msg.readInt32("quests count"); - for (int f = 0; f < num; f ++) - { - const int var = msg.readInt32("quest id"); - const int val = msg.readUInt8("state"); - msg.readInt32("time diff"); - msg.readInt32("time"); - msg.readInt16("objectives count"); - if (questsWindow) - questsWindow->updateQuest(var, val); - if (skillDialog) - skillDialog->updateQuest(var, val); - } - - if (questsWindow) - questsWindow->rebuild(false); -} - -void QuestHandler::processAddQuestsObjectives(Net::MessageIn &msg) -{ - msg.readInt16("len"); - const int quests = msg.readInt32("quests count"); - for (int f = 0; f < quests; f ++) - { - msg.readInt32("quest id"); - msg.readInt32("time diff"); - msg.readInt32("time"); - const int num = msg.readInt16("objectives count"); - for (int d = 0; d < num; d ++) - { - // need use in quests kills list - msg.readInt32("monster id"); - msg.readInt16("count"); - msg.readString(24, "monster name"); - } - } - msg.skipToEnd("unused"); -} - -void QuestHandler::processUpdateQuestsObjectives(Net::MessageIn &msg) -{ - // ignored - msg.readInt16("len"); - const int num = msg.readInt16("objectives count"); - for (int f = 0; f < num; f ++) - { - msg.readInt32("quest id"); - msg.readInt32("monster id"); - msg.readInt16("count old"); - msg.readInt16("count new"); - } -} - -void QuestHandler::processRemoveQuest(Net::MessageIn &msg) -{ - const int var = msg.readInt32("quest id"); - const int val = -1; - - // not removing quest, because this is impossible, - // but changing status to -1 - if (questsWindow) - { - questsWindow->updateQuest(var, val); - questsWindow->rebuild(true); - } - if (skillDialog) - { - skillDialog->updateQuest(var, val); - skillDialog->playUpdateEffect(var + SKILL_VAR_MIN_ID); - } -} - -void QuestHandler::processActivateQuest(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - // +++ need enable/disable quests depend on this packet - msg.readInt32("quest id"); - msg.readUInt8("activate"); -} - -void QuestHandler::processNpcQuestEffect(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - // this packed mostly useless, because manaplus can show any - // kind of effects based on quest states. - msg.readInt32("npc id"); - msg.readInt16("x"); - msg.readInt16("y"); - msg.readInt16("state"); - msg.readInt16("color"); -} - void QuestHandler::setQeustActiveState(const int questId, const bool active) const { diff --git a/src/net/eathena/questhandler.h b/src/net/eathena/questhandler.h index 971ba6cc1..2ec83767f 100644 --- a/src/net/eathena/questhandler.h +++ b/src/net/eathena/questhandler.h @@ -39,21 +39,6 @@ class QuestHandler final : public MessageHandler, public Net::QuestHandler void setQeustActiveState(const int questId, const bool active) const override final; - - protected: - static void processAddQuest(Net::MessageIn &msg); - - static void processAddQuests(Net::MessageIn &msg); - - static void processAddQuestsObjectives(Net::MessageIn &msg); - - static void processUpdateQuestsObjectives(Net::MessageIn &msg); - - static void processRemoveQuest(Net::MessageIn &msg); - - static void processActivateQuest(Net::MessageIn &msg); - - static void processNpcQuestEffect(Net::MessageIn &msg); }; } // namespace EAthena diff --git a/src/net/eathena/questrecv.cpp b/src/net/eathena/questrecv.cpp new file mode 100644 index 000000000..e08d663c9 --- /dev/null +++ b/src/net/eathena/questrecv.cpp @@ -0,0 +1,160 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-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/eathena/questrecv.h" + +#include "gui/windows/skilldialog.h" +#include "gui/windows/questswindow.h" + +#include "net/eathena/messageout.h" +#include "net/eathena/protocol.h" + +#include "resources/skillconsts.h" + +#include "debug.h" + +namespace EAthena +{ + +void QuestRecv::processAddQuest(Net::MessageIn &msg) +{ + const int var = msg.readInt32("quest id"); + const int val = msg.readUInt8("state"); + msg.readUInt8("time diff"); + msg.readInt32("time"); + const int num = msg.readInt16("objectives count"); + for (int f = 0; f < num; f ++) + { + // need use in quests kills list + msg.readInt32("monster id"); + msg.readInt16("count"); + msg.readString(24, "monster name"); + } + + msg.skipToEnd("unused"); + + if (questsWindow) + { + questsWindow->updateQuest(var, val); + questsWindow->rebuild(true); + } + if (skillDialog) + { + skillDialog->updateQuest(var, val); + skillDialog->playUpdateEffect(var + SKILL_VAR_MIN_ID); + } +} + +void QuestRecv::processAddQuests(Net::MessageIn &msg) +{ + msg.readInt16("len"); + const int num = msg.readInt32("quests count"); + for (int f = 0; f < num; f ++) + { + const int var = msg.readInt32("quest id"); + const int val = msg.readUInt8("state"); + msg.readInt32("time diff"); + msg.readInt32("time"); + msg.readInt16("objectives count"); + if (questsWindow) + questsWindow->updateQuest(var, val); + if (skillDialog) + skillDialog->updateQuest(var, val); + } + + if (questsWindow) + questsWindow->rebuild(false); +} + +void QuestRecv::processAddQuestsObjectives(Net::MessageIn &msg) +{ + msg.readInt16("len"); + const int quests = msg.readInt32("quests count"); + for (int f = 0; f < quests; f ++) + { + msg.readInt32("quest id"); + msg.readInt32("time diff"); + msg.readInt32("time"); + const int num = msg.readInt16("objectives count"); + for (int d = 0; d < num; d ++) + { + // need use in quests kills list + msg.readInt32("monster id"); + msg.readInt16("count"); + msg.readString(24, "monster name"); + } + } + msg.skipToEnd("unused"); +} + +void QuestRecv::processUpdateQuestsObjectives(Net::MessageIn &msg) +{ + // ignored + msg.readInt16("len"); + const int num = msg.readInt16("objectives count"); + for (int f = 0; f < num; f ++) + { + msg.readInt32("quest id"); + msg.readInt32("monster id"); + msg.readInt16("count old"); + msg.readInt16("count new"); + } +} + +void QuestRecv::processRemoveQuest(Net::MessageIn &msg) +{ + const int var = msg.readInt32("quest id"); + const int val = -1; + + // not removing quest, because this is impossible, + // but changing status to -1 + if (questsWindow) + { + questsWindow->updateQuest(var, val); + questsWindow->rebuild(true); + } + if (skillDialog) + { + skillDialog->updateQuest(var, val); + skillDialog->playUpdateEffect(var + SKILL_VAR_MIN_ID); + } +} + +void QuestRecv::processActivateQuest(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + // +++ need enable/disable quests depend on this packet + msg.readInt32("quest id"); + msg.readUInt8("activate"); +} + +void QuestRecv::processNpcQuestEffect(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + // this packed mostly useless, because manaplus can show any + // kind of effects based on quest states. + msg.readInt32("npc id"); + msg.readInt16("x"); + msg.readInt16("y"); + msg.readInt16("state"); + msg.readInt16("color"); +} + +} // namespace EAthena diff --git a/src/net/eathena/questrecv.h b/src/net/eathena/questrecv.h new file mode 100644 index 000000000..7b2e351cb --- /dev/null +++ b/src/net/eathena/questrecv.h @@ -0,0 +1,42 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-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_EATHENA_QUESTRECV_H +#define NET_EATHENA_QUESTRECV_H + +#include "net/eathena/messagehandler.h" + +#include "net/questhandler.h" + +namespace EAthena +{ + namespace QuestRecv + { + void processAddQuest(Net::MessageIn &msg); + void processAddQuests(Net::MessageIn &msg); + void processAddQuestsObjectives(Net::MessageIn &msg); + void processUpdateQuestsObjectives(Net::MessageIn &msg); + void processRemoveQuest(Net::MessageIn &msg); + void processActivateQuest(Net::MessageIn &msg); + void processNpcQuestEffect(Net::MessageIn &msg); + } // namespace QuestRecv +} // namespace EAthena + +#endif // NET_EATHENA_QUESTRECV_H diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp index d308d33f6..d40603b7f 100644 --- a/src/net/tmwa/questhandler.cpp +++ b/src/net/tmwa/questhandler.cpp @@ -24,6 +24,7 @@ #include "gui/windows/questswindow.h" #include "net/tmwa/protocol.h" +#include "net/tmwa/questrecv.h" #include "resources/skillconsts.h" @@ -52,11 +53,11 @@ void QuestHandler::handleMessage(Net::MessageIn &msg) switch (msg.getId()) { case SMSG_QUEST_SET_VAR: - processSetQuestVar(msg); + QuestRecv::processSetQuestVar(msg); break; case SMSG_QUEST_PLAYER_VARS: - processPlayerQuests(msg); + QuestRecv::processPlayerQuests(msg); break; default: @@ -65,38 +66,6 @@ void QuestHandler::handleMessage(Net::MessageIn &msg) BLOCK_END("QuestHandler::handleMessage") } -void QuestHandler::processSetQuestVar(Net::MessageIn &msg) -{ - const int var = msg.readInt16("variable"); - const int val = msg.readInt32("value"); - if (questsWindow) - { - questsWindow->updateQuest(var, val); - questsWindow->rebuild(true); - } - if (skillDialog) - { - skillDialog->updateQuest(var, val); - skillDialog->playUpdateEffect(var + SKILL_VAR_MIN_ID); - } -} - -void QuestHandler::processPlayerQuests(Net::MessageIn &msg) -{ - const int count = (msg.readInt16("len") - 4) / 6; - for (int f = 0; f < count; f ++) - { - const int var = msg.readInt16("variable"); - const int val = msg.readInt32("value"); - if (questsWindow) - questsWindow->updateQuest(var, val); - if (skillDialog) - skillDialog->updateQuest(var, val); - } - if (questsWindow) - questsWindow->rebuild(false); -} - void QuestHandler::setQeustActiveState(const int questId A_UNUSED, const bool active A_UNUSED) const { diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h index c63fa56b0..920df82fb 100644 --- a/src/net/tmwa/questhandler.h +++ b/src/net/tmwa/questhandler.h @@ -40,10 +40,6 @@ class QuestHandler final : public MessageHandler, void setQeustActiveState(const int questId, const bool active) const override final; - protected: - static void processSetQuestVar(Net::MessageIn &msg); - - static void processPlayerQuests(Net::MessageIn &msg); }; } // namespace TmwAthena diff --git a/src/net/tmwa/questrecv.cpp b/src/net/tmwa/questrecv.cpp new file mode 100644 index 000000000..51971f1f9 --- /dev/null +++ b/src/net/tmwa/questrecv.cpp @@ -0,0 +1,67 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-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/tmwa/questrecv.h" + +#include "gui/windows/skilldialog.h" +#include "gui/windows/questswindow.h" + +#include "net/tmwa/protocol.h" + +#include "resources/skillconsts.h" + +#include "debug.h" + +namespace TmwAthena +{ + +void QuestRecv::processSetQuestVar(Net::MessageIn &msg) +{ + const int var = msg.readInt16("variable"); + const int val = msg.readInt32("value"); + if (questsWindow) + { + questsWindow->updateQuest(var, val); + questsWindow->rebuild(true); + } + if (skillDialog) + { + skillDialog->updateQuest(var, val); + skillDialog->playUpdateEffect(var + SKILL_VAR_MIN_ID); + } +} + +void QuestRecv::processPlayerQuests(Net::MessageIn &msg) +{ + const int count = (msg.readInt16("len") - 4) / 6; + for (int f = 0; f < count; f ++) + { + const int var = msg.readInt16("variable"); + const int val = msg.readInt32("value"); + if (questsWindow) + questsWindow->updateQuest(var, val); + if (skillDialog) + skillDialog->updateQuest(var, val); + } + if (questsWindow) + questsWindow->rebuild(false); +} + +} // namespace TmwAthena diff --git a/src/net/tmwa/questrecv.h b/src/net/tmwa/questrecv.h new file mode 100644 index 000000000..41d6be3da --- /dev/null +++ b/src/net/tmwa/questrecv.h @@ -0,0 +1,37 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-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_TMWA_QUESTRECV_H +#define NET_TMWA_QUESTRECV_H + +#include "net/tmwa/messagehandler.h" + +#include "net/questhandler.h" + +namespace TmwAthena +{ + namespace QuestRecv + { + void processSetQuestVar(Net::MessageIn &msg); + void processPlayerQuests(Net::MessageIn &msg); + } // namespace QuestRecv +} // namespace TmwAthena + +#endif // NET_TMWA_QUESTRECV_H -- cgit v1.2.3-60-g2f50