From 90a63c3d866812143faab7d2c551cfff8ba61aa3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 20 Jun 2015 18:53:08 +0300 Subject: Move processNameResponse2 from ea namespace into eathena. --- src/net/eathena/beinghandler.cpp | 47 ++++++++++++++++++++++++++++++++++++++++ src/net/eathena/beinghandler.h | 2 ++ 2 files changed, 49 insertions(+) (limited to 'src/net/eathena') diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 4ab060b9a..10161d922 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -26,6 +26,7 @@ #include "effectmanager.h" #include "game.h" #include "notifymanager.h" +#include "party.h" #include "being/localplayer.h" #include "being/mercenaryinfo.h" @@ -1965,4 +1966,50 @@ void BeingHandler::processPvpSet(Net::MessageIn &msg) BLOCK_END("BeingHandler::processPvpSet") } +void BeingHandler::processNameResponse2(Net::MessageIn &msg) +{ + BLOCK_START("BeingHandler::processNameResponse2") + if (!actorManager || !localPlayer) + { + BLOCK_END("BeingHandler::processNameResponse2") + return; + } + + const int len = msg.readInt16("len"); + const BeingId beingId = msg.readBeingId("account ic"); + const std::string str = msg.readString(len - 8, "name"); + Being *const dstBeing = actorManager->findBeing(beingId); + if (dstBeing) + { + if (beingId == localPlayer->getId()) + { + localPlayer->pingResponse(); + } + else + { + dstBeing->setName(str); + dstBeing->updateGuild(); + dstBeing->addToCache(); + + if (dstBeing->getType() == ActorType::Player) + dstBeing->updateColors(); + + if (localPlayer) + { + const Party *const party = localPlayer->getParty(); + if (party && party->isMember(dstBeing->getId())) + { + PartyMember *const member = party->getMember( + dstBeing->getId()); + + if (member) + member->setName(dstBeing->getName()); + } + localPlayer->checkNewName(dstBeing); + } + } + } + BLOCK_END("BeingHandler::processNameResponse2") +} + } // namespace EAthena diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h index 4a88d376f..ba8cf5ce7 100644 --- a/src/net/eathena/beinghandler.h +++ b/src/net/eathena/beinghandler.h @@ -165,6 +165,8 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler static void processBeingViewEquipment(Net::MessageIn &msg); static void processPvpSet(Net::MessageIn &msg); + + static void processNameResponse2(Net::MessageIn &msg); }; } // namespace EAthena -- cgit v1.2.3-70-g09d2