From 8a31e96d8534d402db9cd48183c0b15732f7d95e Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 8 Feb 2010 14:40:04 -0700 Subject: Merge PartyWindow and GuildWindow into SocialWindow --- src/net/ea/beinghandler.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/net/ea/beinghandler.cpp') 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(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); } } -- cgit v1.2.3-70-g09d2