From d3cdfdb52f031d6974d72e61914a073cb2995d34 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 7 Sep 2014 19:05:04 +0300 Subject: Move processPartyInfo from ea namespace into eathena and tmwa. --- src/net/ea/partyhandler.cpp | 104 -------------------------------------------- src/net/ea/partyhandler.h | 2 - 2 files changed, 106 deletions(-) (limited to 'src/net/ea') diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 7e2be5a95..5c5aaf80b 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -81,110 +81,6 @@ void PartyHandler::processPartyCreate(Net::MessageIn &msg) const NotifyManager::notify(NotifyTypes::PARTY_CREATED); } -void PartyHandler::processPartyInfo(Net::MessageIn &msg) const -{ - bool isOldParty = false; - std::set names; - std::set onlineNames; - if (!Ea::taParty) - { - logger->log1("error: party empty in SMSG_PARTY_INFO"); - Ea::taParty = Party::getParty(1); - } - if (Ea::taParty) - { - if (Ea::taParty->getNumberOfElements() > 1) - { - isOldParty = true; - Ea::taParty->getNamesSet(names); - const Party::MemberList *const members = Ea::taParty->getMembers(); - FOR_EACHP (Party::MemberList::const_iterator, it, members) - { - if ((*it)->getOnline()) - onlineNames.insert((*it)->getName()); - } - if (localPlayer) - onlineNames.insert(localPlayer->getName()); - } - } - - if (!localPlayer) - logger->log1("error: localPlayer==0 in SMSG_PARTY_INFO"); - - if (Ea::taParty) - Ea::taParty->clearMembers(); - - const int length = msg.readInt16(); - if (Ea::taParty) - Ea::taParty->setName(msg.readString(24)); - - const int count = (length - 28) / 46; - if (localPlayer && Ea::taParty) - { - localPlayer->setParty(Ea::taParty); - localPlayer->setPartyName(Ea::taParty->getName()); - } - - for (int i = 0; i < count; i++) - { - const int id = msg.readInt32(); - std::string nick = msg.readString(24); - std::string map = msg.readString(16); - const bool leader = msg.readUInt8() == 0U; - const bool online = msg.readUInt8() == 0U; - - if (Ea::taParty) - { - bool joined(false); - - if (isOldParty) - { - if (names.find(nick) == names.end()) - { - NotifyManager::notify(NotifyTypes::PARTY_USER_JOINED, - nick); - joined = true; - } - } - PartyMember *const member = Ea::taParty->addMember(id, nick); - if (member) - { - if (!joined && Ea::partyTab) - { - if (!names.empty() && ((onlineNames.find(nick) - == onlineNames.end() && online) - || (onlineNames.find(nick) != onlineNames.end() - && !online))) - { - Ea::partyTab->showOnline(nick, online); - } - - member->setLeader(leader); - member->setOnline(online); - member->setMap(map); - } - else - { - member->setLeader(leader); - member->setOnline(online); - member->setMap(map); - } - } - } - } - - if (Ea::taParty) - Ea::taParty->sort(); - - if (localPlayer && Ea::taParty) - { - localPlayer->setParty(Ea::taParty); - localPlayer->setPartyName(Ea::taParty->getName()); - if (socialWindow) - socialWindow->updateParty(); - } -} - void PartyHandler::processPartyInviteResponse(Net::MessageIn &msg) const { if (!Ea::partyTab) diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h index 93ebde5c4..fbe77d376 100644 --- a/src/net/ea/partyhandler.h +++ b/src/net/ea/partyhandler.h @@ -62,8 +62,6 @@ class PartyHandler notfinal : public Net::PartyHandler virtual void processPartyCreate(Net::MessageIn &msg) const; - virtual void processPartyInfo(Net::MessageIn &msg) const; - virtual void processPartyInviteResponse(Net::MessageIn &msg) const; virtual void processPartyInvited(Net::MessageIn &msg) const; -- cgit v1.2.3-70-g09d2