diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-02-08 14:40:04 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-02-08 14:43:51 -0700 |
| commit | 8a31e96d8534d402db9cd48183c0b15732f7d95e (patch) | |
| tree | 885d83febf301c1289c3bf7f83bf9dca89e0347c /src/net/ea/beinghandler.cpp | |
| parent | bc5c031e43eff506c925682349dd2a52b89d6565 (diff) | |
| download | mana-8a31e96d8534d402db9cd48183c0b15732f7d95e.tar.gz mana-8a31e96d8534d402db9cd48183c0b15732f7d95e.tar.bz2 mana-8a31e96d8534d402db9cd48183c0b15732f7d95e.tar.xz mana-8a31e96d8534d402db9cd48183c0b15732f7d95e.zip | |
Merge PartyWindow and GuildWindow into SocialWindow
Diffstat (limited to 'src/net/ea/beinghandler.cpp')
| -rw-r--r-- | src/net/ea/beinghandler.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 93962613..86bfe929 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -28,10 +28,9 @@ #include "localplayer.h" #include "log.h" #include "npc.h" +#include "party.h" #include "playerrelations.h" -#include "gui/partywindow.h" - #include "net/ea/protocol.h" #include "resources/colordb.h" @@ -515,11 +514,10 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) player = dynamic_cast<Player*>(dstBeing); - { - PartyMember *member = partyWindow->findMember(id); - if (member && member->getAvatar()->getOnline()) + if (Party *party = player_node->getParty()){ + if (party->isMember(id)) { - player->setInParty(true); + player->setParty(party); } } |