diff options
| author | Stefan Dombrowski <stefan@uni-bonn.de> | 2011-05-15 15:15:48 +0200 |
|---|---|---|
| committer | Stefan Dombrowski <stefan@uni-bonn.de> | 2011-05-15 15:15:48 +0200 |
| commit | dbfee8acae48ee1eec46d049656e83e952686ece (patch) | |
| tree | ba39bbfd9851c32d1d32ead544a88a245c8bf434 /src/gui | |
| parent | 15beafcf8c2c489187a1233d03937b0e1eeb130a (diff) | |
| download | mana-dbfee8acae48ee1eec46d049656e83e952686ece.tar.gz mana-dbfee8acae48ee1eec46d049656e83e952686ece.tar.bz2 mana-dbfee8acae48ee1eec46d049656e83e952686ece.tar.xz mana-dbfee8acae48ee1eec46d049656e83e952686ece.zip | |
Starting to fix party invite
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/popupmenu.cpp | 5 | ||||
| -rw-r--r-- | src/gui/socialwindow.cpp | 4 | ||||
| -rw-r--r-- | src/gui/socialwindow.h | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 7e648311..1c2f3b60 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -129,10 +129,13 @@ void PopupMenu::showPopup(int x, int y, Being *being) mBrowserBox->addRow(strprintf("@@guild|%s@@", strprintf(_("Invite %s to join your guild"), name.c_str()).c_str())); - if (player_node->isInParty()) + if (player_node->isInParty() || + Net::getNetworkType() == ServerInfo::MANASERV) + { mBrowserBox->addRow(strprintf("@@party|%s@@", strprintf(_("Invite %s to join your party"), name.c_str()).c_str())); + } if (player_node->isGM()) { diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 07f37eec..1aa57f2f 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -566,8 +566,8 @@ void SocialWindow::showGuildInvite(const std::string &guildName, mGuildInvited = guildId; } -void SocialWindow::showPartyInvite(const std::string &partyName, - const std::string &inviter) +void SocialWindow::showPartyInvite(const std::string &inviter, + const std::string &partyName) { // check there isnt already an invite showing if (mPartyInviter != "") diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h index 885c0e54..b8930918 100644 --- a/src/gui/socialwindow.h +++ b/src/gui/socialwindow.h @@ -69,8 +69,8 @@ public: void showGuildCreate(); - void showPartyInvite(const std::string &partyName, - const std::string &inviter = ""); + void showPartyInvite(const std::string &inviter, + const std::string &partyName = ""); void showPartyCreate(); |