diff options
| author | Chuck Miller <shadowmil@gmail.com> | 2009-05-11 21:39:29 -0400 |
|---|---|---|
| committer | Chuck Miller <shadowmil@gmail.com> | 2009-05-11 21:39:29 -0400 |
| commit | 260e22a429311e597e91e2d9a149c8fdbf5df5b3 (patch) | |
| tree | dc35a88b84f9858a167e34769a8e8111f47ebc7d /src/net | |
| parent | 6f501e2f687df1550dfc024f7ac5d36a5b88d548 (diff) | |
| parent | eac0ebd493f6be170c8caa8df21ae147b1486d50 (diff) | |
| download | mana-260e22a429311e597e91e2d9a149c8fdbf5df5b3.tar.gz mana-260e22a429311e597e91e2d9a149c8fdbf5df5b3.tar.bz2 mana-260e22a429311e597e91e2d9a149c8fdbf5df5b3.tar.xz mana-260e22a429311e597e91e2d9a149c8fdbf5df5b3.zip | |
Merge branch 'master' of git://gitorious.org/tmw/mainline
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/gui/partytab.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/partyhandler.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp index 12ca0d8d..9b0fc8c5 100644 --- a/src/net/ea/gui/partytab.cpp +++ b/src/net/ea/gui/partytab.cpp @@ -38,7 +38,7 @@ PartyTab::PartyTab() : ChatTab(_("Party")) { - setTabColor(guiPalette->getColor(Palette::PARTY)); + setTabColor(&guiPalette->getColor(Palette::PARTY)); } PartyTab::~PartyTab() diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 7216719d..0eda7792 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -79,6 +79,7 @@ void PartyHandler::handleMessage(MessageIn &msg) { partyTab->chatLog(_("Party successfully created."), BY_SERVER); player_node->setInParty(true); + partyWindow->setVisible(true); } break; case SMSG_PARTY_INFO: @@ -230,12 +231,15 @@ void PartyHandler::handleMessage(MessageIn &msg) { player_node->setInParty(false); partyWindow->clearMembers(); + partyWindow->setVisible(false); partyTab->chatLog(_("You have left the party."), BY_SERVER); } else + { partyTab->chatLog(strprintf(_("%s has left your party."), nick.c_str()), BY_SERVER); - partyWindow->removeMember(id); + partyWindow->removeMember(id); + } break; } case SMSG_PARTY_UPDATE_HP: |