diff options
author | Jared Adams <jaxad0127@gmail.com> | 2010-02-08 15:39:02 -0700 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2010-02-08 15:39:02 -0700 |
commit | a4007a7f8f253e90bb189cfb22b3e0c798440bdc (patch) | |
tree | 0b04750b4e108496f58490edd0e91c3d313c34a3 /src/net | |
parent | 40e1928f3f20efe1be383c4c9a55dffc5506d56f (diff) | |
download | mana-a4007a7f8f253e90bb189cfb22b3e0c798440bdc.tar.gz mana-a4007a7f8f253e90bb189cfb22b3e0c798440bdc.tar.bz2 mana-a4007a7f8f253e90bb189cfb22b3e0c798440bdc.tar.xz mana-a4007a7f8f253e90bb189cfb22b3e0c798440bdc.zip |
Fix some bugs in party handling and add HP to AvatarListBox
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/ea/partyhandler.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 6934dde0..030914b4 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -236,8 +236,8 @@ void PartyHandler::handleMessage(Net::MessageIn &msg) msg.readInt8(); // fail if (id == player_node->getId()) { + eaParty->removeFromMembers(); eaParty->clearMembers(); - player_node->setParty(NULL); localChatTab->chatLog(_("You have left the party."), BY_SERVER); if (partyTab) @@ -251,6 +251,11 @@ void PartyHandler::handleMessage(Net::MessageIn &msg) { partyTab->chatLog(strprintf(_("%s has left your party."), nick.c_str()), BY_SERVER); + Player *p = dynamic_cast<Player*>(beingManager->findBeing(id)); + if (p) + { + p->setParty(NULL); + } eaParty->removeMember(id); } break; |