summaryrefslogtreecommitdiff
path: root/src/gui/popups
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-10 18:24:38 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-10 18:24:38 +0300
commitab07e8d1c5525d9bcbd3669a874d061cbc0236da (patch)
tree37f30f7e577d3b7013a32165e04f6647674002ef /src/gui/popups
parent143ec36c93ea41b4516b5c8b99f021b8bec79164 (diff)
downloadManaVerse-ab07e8d1c5525d9bcbd3669a874d061cbc0236da.tar.gz
ManaVerse-ab07e8d1c5525d9bcbd3669a874d061cbc0236da.tar.bz2
ManaVerse-ab07e8d1c5525d9bcbd3669a874d061cbc0236da.tar.xz
ManaVerse-ab07e8d1c5525d9bcbd3669a874d061cbc0236da.zip
In popup manager rename function addParty into addPartyName.
Diffstat (limited to 'src/gui/popups')
-rw-r--r--src/gui/popups/popupmenu.cpp6
-rw-r--r--src/gui/popups/popupmenu.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 14f3cf495..ed3d82dde 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -177,7 +177,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
mBrowserBox->addRow("##3---");
addFollow();
- addParty(being->getPartyName());
+ addPartyName(being->getPartyName());
const Guild *const guild1 = being->getGuild();
const Guild *const guild2 = localPlayer->getGuild();
@@ -1312,7 +1312,7 @@ void PopupMenu::handleLink(const std::string &link,
else if (link == "party" && being &&
being->getType() == ActorType::PLAYER)
{
- Net::getPartyHandler()->invite(being);
+ Net::getPartyHandler()->invite(being->getName());
}
else if (link == "kick party" && being
&& being->getType() == ActorType::PLAYER)
@@ -2704,7 +2704,7 @@ void PopupMenu::addBuySellDefault()
}
}
-void PopupMenu::addParty(const std::string &partyName)
+void PopupMenu::addPartyName(const std::string &partyName)
{
if (localPlayer->isInParty())
{
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index 2e15652e6..83fe8d563 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -157,7 +157,7 @@ class PopupMenu final : public Popup, public LinkHandler
void addBuySell(const Being *const being);
- void addParty(const std::string &partyName);
+ void addPartyName(const std::string &partyName);
void addBuySellDefault();