From d1ed605d722ea17a9d5576bdb306b9f4680d646f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 26 Aug 2015 23:41:49 +0300 Subject: Move receive code from homunculushandler into separate file. --- src/CMakeLists.txt | 2 + src/Makefile.am | 2 + src/net/eathena/homunculushandler.cpp | 154 ++------------------------- src/net/eathena/homunculushandler.h | 11 -- src/net/eathena/homunculusrecv.cpp | 192 ++++++++++++++++++++++++++++++++++ src/net/eathena/homunculusrecv.h | 43 ++++++++ 6 files changed, 245 insertions(+), 159 deletions(-) create mode 100644 src/net/eathena/homunculusrecv.cpp create mode 100644 src/net/eathena/homunculusrecv.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2e5c1345a..471ff7c3f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1607,6 +1607,8 @@ SET(SRCS_EATHENA net/eathena/guildrecv.h net/eathena/homunculushandler.cpp net/eathena/homunculushandler.h + net/eathena/homunculusrecv.cpp + net/eathena/homunculusrecv.h net/eathena/inventoryhandler.cpp net/eathena/inventoryhandler.h net/eathena/itemflags.h diff --git a/src/Makefile.am b/src/Makefile.am index df9b030e1..9a5839036 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1453,6 +1453,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \ net/eathena/guildrecv.h \ net/eathena/homunculushandler.cpp \ net/eathena/homunculushandler.h \ + net/eathena/homunculusrecv.cpp \ + net/eathena/homunculusrecv.h \ net/eathena/inventoryhandler.cpp \ net/eathena/inventoryhandler.h \ net/eathena/itemflags.h \ diff --git a/src/net/eathena/homunculushandler.cpp b/src/net/eathena/homunculushandler.cpp index e98d73fe0..79a4d4f10 100644 --- a/src/net/eathena/homunculushandler.cpp +++ b/src/net/eathena/homunculushandler.cpp @@ -32,6 +32,7 @@ #include "net/serverfeatures.h" +#include "net/eathena/homunculusrecv.h" #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" @@ -69,23 +70,23 @@ void HomunculusHandler::handleMessage(Net::MessageIn &msg) switch (msg.getId()) { case SMSG_HOMUNCULUS_SKILLS: - processHomunculusSkills(msg); + HomunculusRecv::processHomunculusSkills(msg); break; case SMSG_HOMUNCULUS_DATA: - processHomunculusData(msg); + HomunculusRecv::processHomunculusData(msg); break; case SMSG_HOMUNCULUS_INFO: - processHomunculusInfo(msg); + HomunculusRecv::processHomunculusInfo(msg); break; case SMSG_HOMUNCULUS_SKILL_UP: - processHomunculusSkillUp(msg); + HomunculusRecv::processHomunculusSkillUp(msg); break; case SMSG_HOMUNCULUS_FOOD: - processHomunculusFood(msg); + HomunculusRecv::processHomunculusFood(msg); break; default: @@ -93,149 +94,6 @@ void HomunculusHandler::handleMessage(Net::MessageIn &msg) } } -void HomunculusHandler::processHomunculusSkills(Net::MessageIn &msg) -{ - if (skillDialog) - skillDialog->hideSkills(SkillOwner::Homunculus); - - const int count = (msg.readInt16("len") - 4) / 37; - for (int f = 0; f < count; f ++) - { - const int skillId = msg.readInt16("skill id"); - const SkillType::SkillType inf = static_cast( - msg.readInt16("inf")); - msg.readInt16("unused"); - const int level = msg.readInt16("skill level"); - const int sp = msg.readInt16("sp"); - const int range = msg.readInt16("range"); - const std::string name = msg.readString(24, "skill name"); - const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); - PlayerInfo::setSkillLevel(skillId, level); - if (skillDialog) - { - if (!skillDialog->updateSkill(skillId, range, up, inf, sp)) - { - skillDialog->addSkill(SkillOwner::Homunculus, - skillId, name, level, range, up, inf, sp); - } - } - } - if (skillDialog) - skillDialog->updateModels(); -} - -void HomunculusHandler::processHomunculusData(Net::MessageIn &msg) -{ - msg.readUInt8("unused"); - const int cmd = msg.readUInt8("state"); - const BeingId id = msg.readBeingId("homunculus id"); - Being *const dstBeing = actorManager->findBeing(id); - const int data = msg.readInt32("data"); - if (!cmd) // pre init - { - HomunculusInfo *const info = new HomunculusInfo; - info->id = id; - PlayerInfo::setHomunculus(info); - PlayerInfo::setHomunculusBeing(dstBeing); - return; - } - HomunculusInfo *const info = PlayerInfo::getHomunculus(); - if (!info) - return; - switch (cmd) - { - case 1: // intimacy - info->intimacy = data; - break; - case 2: // hunger - info->hungry = data; - break; - case 3: // accesory - info->equip = data; - break; - default: - break; - } -} - -void HomunculusHandler::processHomunculusInfo(Net::MessageIn &msg) -{ - const std::string name = msg.readString(24, "name"); - msg.readUInt8("flags"); // 0x01 - renamed, 0x02 - vaporize, 0x04 - alive - const int level = msg.readInt16("level"); - const int hungry = msg.readInt16("hungry"); - const int intimacy = msg.readInt16("intimacy"); - const int equip = msg.readInt16("equip"); - msg.readInt16("atk"); - msg.readInt16("matk"); - msg.readInt16("hit"); - msg.readInt16("luk/3 or crit/10"); - msg.readInt16("def"); - msg.readInt16("mdef"); - msg.readInt16("flee"); - msg.readInt16("attack speed"); - msg.readInt16("hp"); - msg.readInt16("max hp"); - msg.readInt16("sp"); - msg.readInt16("max sp"); - msg.readInt32("exp"); - msg.readInt32("next exp"); - msg.readInt16("skill points"); - const int range = msg.readInt16("attack range"); - - HomunculusInfo *const info = PlayerInfo::getHomunculus(); - if (!info) // we can't find homunculus being because id is missing - return; - Being *const dstBeing = actorManager->findBeing(info->id); - - info->name = name; - info->level = level; - info->range = range; - info->hungry = hungry; - info->intimacy = intimacy; - info->equip = equip; - PlayerInfo::setHomunculusBeing(dstBeing); -} - -void HomunculusHandler::processHomunculusSkillUp(Net::MessageIn &msg) -{ - const int skillId = msg.readInt16("skill id"); - const int level = msg.readInt16("level"); - const int sp = msg.readInt16("sp"); - const int range = msg.readInt16("range"); - const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); - - if (skillDialog && PlayerInfo::getSkillLevel(skillId) != level) - skillDialog->playUpdateEffect(skillId); - PlayerInfo::setSkillLevel(skillId, level); - if (skillDialog) - { - if (!skillDialog->updateSkill(skillId, range, - up, SkillType::Unknown, sp)) - { - skillDialog->addSkill(SkillOwner::Homunculus, - skillId, "", level, - range, up, SkillType::Unknown, sp); - } - } -} - -void HomunculusHandler::processHomunculusFood(Net::MessageIn &msg) -{ - const int flag = msg.readUInt8("fail"); - const int itemId = msg.readInt16("food id"); - if (flag) - { - NotifyManager::notify(NotifyTypes::HOMUNCULUS_FEED_OK); - } - else - { - const std::string name = strprintf("[@@%d|%s@@]", itemId, - ItemDB::get(itemId).getName().c_str()); - NotifyManager::notify(NotifyTypes::HOMUNCULUS_FEED_FAIL, name); - } -} - void HomunculusHandler::setName(const std::string &name) const { createOutPacket(CMSG_HOMUNCULUS_SET_NAME); diff --git a/src/net/eathena/homunculushandler.h b/src/net/eathena/homunculushandler.h index 35955b0ba..3ae52f820 100644 --- a/src/net/eathena/homunculushandler.h +++ b/src/net/eathena/homunculushandler.h @@ -57,17 +57,6 @@ class HomunculusHandler final : public MessageHandler, void emote(const uint8_t emoteId) const override final; void setDirection(const unsigned char type) const override final; - - protected: - static void processHomunculusSkills(Net::MessageIn &msg); - - static void processHomunculusData(Net::MessageIn &msg); - - static void processHomunculusInfo(Net::MessageIn &msg); - - static void processHomunculusSkillUp(Net::MessageIn &msg); - - static void processHomunculusFood(Net::MessageIn &msg); }; } // namespace EAthena diff --git a/src/net/eathena/homunculusrecv.cpp b/src/net/eathena/homunculusrecv.cpp new file mode 100644 index 000000000..1e0cec814 --- /dev/null +++ b/src/net/eathena/homunculusrecv.cpp @@ -0,0 +1,192 @@ +/* + * The ManaPlus Client + * 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/eathena/homunculusrecv.h" + +#include "actormanager.h" +#include "notifymanager.h" + +#include "being/homunculusinfo.h" +#include "being/playerinfo.h" + +#include "enums/resources/notifytypes.h" + +#include "gui/windows/skilldialog.h" + +#include "net/serverfeatures.h" + +#include "net/eathena/messageout.h" +#include "net/eathena/protocol.h" + +#include "resources/iteminfo.h" + +#include "resources/db/itemdb.h" + +#include "utils/stringutils.h" + +#include "debug.h" + +namespace EAthena +{ + +void HomunculusRecv::processHomunculusSkills(Net::MessageIn &msg) +{ + if (skillDialog) + skillDialog->hideSkills(SkillOwner::Homunculus); + + const int count = (msg.readInt16("len") - 4) / 37; + for (int f = 0; f < count; f ++) + { + const int skillId = msg.readInt16("skill id"); + const SkillType::SkillType inf = static_cast( + msg.readInt16("inf")); + msg.readInt16("unused"); + const int level = msg.readInt16("skill level"); + const int sp = msg.readInt16("sp"); + const int range = msg.readInt16("range"); + const std::string name = msg.readString(24, "skill name"); + const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); + PlayerInfo::setSkillLevel(skillId, level); + if (skillDialog) + { + if (!skillDialog->updateSkill(skillId, range, up, inf, sp)) + { + skillDialog->addSkill(SkillOwner::Homunculus, + skillId, name, level, range, up, inf, sp); + } + } + } + if (skillDialog) + skillDialog->updateModels(); +} + +void HomunculusRecv::processHomunculusData(Net::MessageIn &msg) +{ + msg.readUInt8("unused"); + const int cmd = msg.readUInt8("state"); + const BeingId id = msg.readBeingId("homunculus id"); + Being *const dstBeing = actorManager->findBeing(id); + const int data = msg.readInt32("data"); + if (!cmd) // pre init + { + HomunculusInfo *const info = new HomunculusInfo; + info->id = id; + PlayerInfo::setHomunculus(info); + PlayerInfo::setHomunculusBeing(dstBeing); + return; + } + HomunculusInfo *const info = PlayerInfo::getHomunculus(); + if (!info) + return; + switch (cmd) + { + case 1: // intimacy + info->intimacy = data; + break; + case 2: // hunger + info->hungry = data; + break; + case 3: // accesory + info->equip = data; + break; + default: + break; + } +} + +void HomunculusRecv::processHomunculusInfo(Net::MessageIn &msg) +{ + const std::string name = msg.readString(24, "name"); + msg.readUInt8("flags"); // 0x01 - renamed, 0x02 - vaporize, 0x04 - alive + const int level = msg.readInt16("level"); + const int hungry = msg.readInt16("hungry"); + const int intimacy = msg.readInt16("intimacy"); + const int equip = msg.readInt16("equip"); + msg.readInt16("atk"); + msg.readInt16("matk"); + msg.readInt16("hit"); + msg.readInt16("luk/3 or crit/10"); + msg.readInt16("def"); + msg.readInt16("mdef"); + msg.readInt16("flee"); + msg.readInt16("attack speed"); + msg.readInt16("hp"); + msg.readInt16("max hp"); + msg.readInt16("sp"); + msg.readInt16("max sp"); + msg.readInt32("exp"); + msg.readInt32("next exp"); + msg.readInt16("skill points"); + const int range = msg.readInt16("attack range"); + + HomunculusInfo *const info = PlayerInfo::getHomunculus(); + if (!info) // we can't find homunculus being because id is missing + return; + Being *const dstBeing = actorManager->findBeing(info->id); + + info->name = name; + info->level = level; + info->range = range; + info->hungry = hungry; + info->intimacy = intimacy; + info->equip = equip; + PlayerInfo::setHomunculusBeing(dstBeing); +} + +void HomunculusRecv::processHomunculusSkillUp(Net::MessageIn &msg) +{ + const int skillId = msg.readInt16("skill id"); + const int level = msg.readInt16("level"); + const int sp = msg.readInt16("sp"); + const int range = msg.readInt16("range"); + const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); + + if (skillDialog && PlayerInfo::getSkillLevel(skillId) != level) + skillDialog->playUpdateEffect(skillId); + PlayerInfo::setSkillLevel(skillId, level); + if (skillDialog) + { + if (!skillDialog->updateSkill(skillId, range, + up, SkillType::Unknown, sp)) + { + skillDialog->addSkill(SkillOwner::Homunculus, + skillId, "", level, + range, up, SkillType::Unknown, sp); + } + } +} + +void HomunculusRecv::processHomunculusFood(Net::MessageIn &msg) +{ + const int flag = msg.readUInt8("fail"); + const int itemId = msg.readInt16("food id"); + if (flag) + { + NotifyManager::notify(NotifyTypes::HOMUNCULUS_FEED_OK); + } + else + { + const std::string name = strprintf("[@@%d|%s@@]", itemId, + ItemDB::get(itemId).getName().c_str()); + NotifyManager::notify(NotifyTypes::HOMUNCULUS_FEED_FAIL, name); + } +} + +} // namespace EAthena diff --git a/src/net/eathena/homunculusrecv.h b/src/net/eathena/homunculusrecv.h new file mode 100644 index 000000000..46c61df47 --- /dev/null +++ b/src/net/eathena/homunculusrecv.h @@ -0,0 +1,43 @@ +/* + * The ManaPlus Client + * 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_EATHENA_HOMUNCULUSRECV_H +#define NET_EATHENA_HOMUNCULUSRECV_H + +#ifdef EATHENA_SUPPORT + +#include "net/homunculushandler.h" + +#include "net/eathena/messagehandler.h" + +namespace EAthena +{ + namespace HomunculusRecv + { + void processHomunculusSkills(Net::MessageIn &msg); + void processHomunculusData(Net::MessageIn &msg); + void processHomunculusInfo(Net::MessageIn &msg); + void processHomunculusSkillUp(Net::MessageIn &msg); + void processHomunculusFood(Net::MessageIn &msg); + } // namespace HomunculusRecv +} // namespace EAthena + +#endif // EATHENA_SUPPORT +#endif // NET_EATHENA_HOMUNCULUSRECV_H -- cgit v1.2.3-70-g09d2