summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-11 23:22:41 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-11 23:22:41 +0300
commitf441bb5b1dbb6ea579d7628f39bdd1f53787756e (patch)
tree058dfc4e287b75456a67aecd88362afdb61ea2d4
parent2602ebc1da53d04f3b6e01d59bad63147b21b8c9 (diff)
downloadmv-f441bb5b1dbb6ea579d7628f39bdd1f53787756e.tar.gz
mv-f441bb5b1dbb6ea579d7628f39bdd1f53787756e.tar.bz2
mv-f441bb5b1dbb6ea579d7628f39bdd1f53787756e.tar.xz
mv-f441bb5b1dbb6ea579d7628f39bdd1f53787756e.zip
Remove "friend" popup menu handler.
-rw-r--r--src/gui/popups/popupmenu.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index ec79231f1..c0fd3ee67 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -979,17 +979,8 @@ void PopupMenu::handleLink(const std::string &link,
if (actorManager)
being = actorManager->findBeing(mBeingId);
- if (link == "friend" && being &&
- being->getType() == ActorType::Player)
- {
- player_relations.setRelation(being->getName(), PlayerRelation::FRIEND);
- }
- else if (link == "friend" && !mNick.empty())
- {
- player_relations.setRelation(mNick, PlayerRelation::FRIEND);
- }
// Guild action
- else if (link == "guild" && !mNick.empty())
+ if (link == "guild" && !mNick.empty())
{
if (localPlayer)
{
@@ -2596,7 +2587,7 @@ void PopupMenu::addPlayerRelation(const std::string &name)
case PlayerRelation::NEUTRAL:
// TRANSLATORS: popup menu item
// TRANSLATORS: add player to friends list
- mBrowserBox->addRow("friend", _("Be friend"));
+ mBrowserBox->addRow("/friend 'NAME'", _("Be friend"));
addNormalRelations();
break;