diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-10-12 14:39:39 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-10-12 14:39:39 +0300 |
commit | a9c39ea2e28e47118f58a040c4eb949b84bf9e20 (patch) | |
tree | b14a45632d14d8293422fc4707e8a3fd451b6f18 /src/net/eathena | |
parent | c9d8a97059e24d24011870fae89199e1cb44e5ef (diff) | |
download | manaverse-a9c39ea2e28e47118f58a040c4eb949b84bf9e20.tar.gz manaverse-a9c39ea2e28e47118f58a040c4eb949b84bf9e20.tar.bz2 manaverse-a9c39ea2e28e47118f58a040c4eb949b84bf9e20.tar.xz manaverse-a9c39ea2e28e47118f58a040c4eb949b84bf9e20.zip |
Move PartyTab from net namespace into gui.
Diffstat (limited to 'src/net/eathena')
-rw-r--r-- | src/net/eathena/generalhandler.cpp | 4 | ||||
-rw-r--r-- | src/net/eathena/partyhandler.cpp | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 25a036bb4..80277701b 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -36,7 +36,7 @@ #include "net/ea/guildhandler.h" #include "gui/widgets/tabs/chat/guildtab.h" -#include "net/ea/gui/partytab.h" +#include "gui/widgets/tabs/chat/partytab.h" #include "net/eathena/adminhandler.h" #include "net/eathena/auctionhandler.h" @@ -380,7 +380,7 @@ void GeneralHandler::gameEnded() const } delete2(guildTab); - delete2(Ea::partyTab); + delete2(partyTab); } } // namespace EAthena diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp index d63aa69cc..030267aa8 100644 --- a/src/net/eathena/partyhandler.cpp +++ b/src/net/eathena/partyhandler.cpp @@ -30,7 +30,7 @@ #include "gui/windows/chatwindow.h" #include "gui/windows/socialwindow.h" -#include "net/ea/gui/partytab.h" +#include "gui/widgets/tabs/chat/partytab.h" #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" @@ -243,8 +243,8 @@ void PartyHandler::processPartyMemberInfo(Net::MessageIn &msg) PartyMember *const member = Ea::taParty->addMember(id, nick); if (member) { - if (Ea::partyTab && member->getOnline() != online) - Ea::partyTab->showOnline(nick, online); + if (partyTab && member->getOnline() != online) + partyTab->showOnline(nick, online); member->setLeader(leader); member->setOnline(online); member->setMap(map); @@ -255,7 +255,7 @@ void PartyHandler::processPartyMemberInfo(Net::MessageIn &msg) void PartyHandler::processPartySettings(Net::MessageIn &msg) { - if (!Ea::partyTab) + if (!partyTab) { if (!chatWindow) return; @@ -279,7 +279,7 @@ void PartyHandler::processPartyInfo(Net::MessageIn &msg) const logger->log1("error: party empty in SMSG_PARTY_INFO"); Ea::taParty = Party::getParty(1); } - if (!Ea::partyTab) + if (!partyTab) createTab(); if (Ea::taParty) @@ -340,14 +340,14 @@ void PartyHandler::processPartyInfo(Net::MessageIn &msg) const PartyMember *const member = Ea::taParty->addMember(id, nick); if (member) { - if (!joined && Ea::partyTab) + if (!joined && partyTab) { if (!names.empty() && ((onlineNames.find(nick) == onlineNames.end() && online) || (onlineNames.find(nick) != onlineNames.end() && !online))) { - Ea::partyTab->showOnline(nick, online); + partyTab->showOnline(nick, online); } member->setLeader(leader); @@ -389,12 +389,12 @@ void PartyHandler::processPartyMessage(Net::MessageIn &msg) const if (pos != std::string::npos) chatMsg.erase(0, pos + 3); - if (Ea::taParty && Ea::partyTab) + if (Ea::taParty && partyTab) { const PartyMember *const member = Ea::taParty->getMember(id); if (member) { - Ea::partyTab->chatLog(member->getName(), chatMsg); + partyTab->chatLog(member->getName(), chatMsg); } else { @@ -406,7 +406,7 @@ void PartyHandler::processPartyMessage(Net::MessageIn &msg) const void PartyHandler::processPartyInviteResponse(Net::MessageIn &msg) const { - if (!Ea::partyTab) + if (!partyTab) return; const std::string nick = msg.readString(24, "nick"); |