From dc333fcd9b2840a3728266ba84384fa41ac4130d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 11 Dec 2014 21:47:46 +0300 Subject: Remove "blacklist" popup menu handler. --- src/gui/popups/popupmenu.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'src/gui') diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 95f639831..f94a75ee6 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -979,18 +979,8 @@ void PopupMenu::handleLink(const std::string &link, if (actorManager) being = actorManager->findBeing(mBeingId); - if (link == "blacklist" && being && + if (link == "enemy" && being && being->getType() == ActorType::Player) - { - player_relations.setRelation(being->getName(), - PlayerRelation::BLACKLISTED); - } - else if (link == "blacklist" && !mNick.empty()) - { - player_relations.setRelation(mNick, PlayerRelation::BLACKLISTED); - } - else if (link == "enemy" && being && - being->getType() == ActorType::Player) { player_relations.setRelation(being->getName(), PlayerRelation::ENEMY2); @@ -2620,7 +2610,7 @@ void PopupMenu::addNormalRelations() mBrowserBox->addRow("/ignore 'NAME'", _("Ignore")); // TRANSLATORS: popup menu item // TRANSLATORS: add player to black list - mBrowserBox->addRow("blacklist", _("Black list")); + mBrowserBox->addRow("/blacklist 'NAME'", _("Black list")); // TRANSLATORS: popup menu item // TRANSLATORS: add player to enemy list mBrowserBox->addRow("enemy", _("Set as enemy")); @@ -2695,7 +2685,7 @@ void PopupMenu::addPlayerRelation(const std::string &name) mBrowserBox->addRow("/ignore 'NAME'", _("Ignore")); // TRANSLATORS: popup menu item // TRANSLATORS: add player to black list - mBrowserBox->addRow("blacklist", _("Black list")); + mBrowserBox->addRow("/blacklist 'NAME'", _("Black list")); // TRANSLATORS: popup menu item // TRANSLATORS: add player to erased list mBrowserBox->addRow("erase", _("Erase")); -- cgit v1.2.3-70-g09d2