Merge branch 'master' of gitorious.org:mana/mana

Conflicts:
	src/being.cpp

1 files changed, 12 insertions, 7 deletions

diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 157898dc..922e59d1 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -68,11 +68,8 @@ PartyHandler::PartyHandler():
 
 PartyHandler::~PartyHandler()
 {
-    if (partyTab)
-    {
-        delete partyTab;
-        partyTab = 0;
-    }
+    delete partyTab;
+    partyTab = 0;
 }
 
 void PartyHandler::handleMessage(Net::MessageIn &msg)
@@ -104,11 +101,12 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
                     bool leader = msg.readInt8() == 0;
                     bool online = msg.readInt8() == 0;
 
-                    PartyMember *member = new PartyMember(PARTY_ID, id, nick);
+                    PartyMember *member = eaParty->addMember(id, nick);
                     member->setLeader(leader);
                     member->setOnline(online);
-                    eaParty->addMember(member);
                 }
+
+                player_node->setParty(eaParty);
             }
             break;
         case SMSG_PARTY_INVITE_RESPONSE:
@@ -270,6 +268,13 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
                     m->setHp(hp);
                     m->setMaxHp(maxhp);
                 }
+
+                // The server only sends this when the member is in range, so
+                // lets make sure they get the party hilight.
+                if (Being *b = beingManager->findBeing(id))
+                {
+                    static_cast<Player*>(b)->setParty(eaParty);
+                }
             }
             break;
         case SMSG_PARTY_UPDATE_COORDS: