diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
| commit | 62ec17f6e489ec50f17219444468aeb8969dc961 (patch) | |
| tree | 350d7edb5c26c282a4e1906544536d68831228ac /src/net/ea/partyhandler.cpp | |
| parent | 71d924d7dcdac067f02a317e9353ee067dbd0bde (diff) | |
| parent | fd484fc70fca32ff9065b91c175089b65aa3fd26 (diff) | |
| download | plus-stripped1.1.9.4.tar.gz plus-stripped1.1.9.4.tar.bz2 plus-stripped1.1.9.4.tar.xz plus-stripped1.1.9.4.zip | |
Merge branch 'master' into strippedstripped1.1.9.4
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/include/guichan/basiccontainer.hpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'src/net/ea/partyhandler.cpp')
| -rw-r--r-- | src/net/ea/partyhandler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 045a2332b..bd6f19d97 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -359,6 +359,7 @@ void PartyHandler::processPartyLeave(Net::MessageIn &msg) if (socialWindow && Ea::taParty) socialWindow->removeTab(Ea::taParty); + player_node->setPartyName(""); } else { @@ -372,7 +373,10 @@ void PartyHandler::processPartyLeave(Net::MessageIn &msg) { Being *b = actorSpriteManager->findBeing(id); if (b && b->getType() == Being::PLAYER) + { b->setParty(0); + b->setPartyName(""); + } } if (Ea::taParty) Ea::taParty->removeMember(id); |