diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-12-11 21:47:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-12-11 21:47:46 +0300 |
| commit | dc333fcd9b2840a3728266ba84384fa41ac4130d (patch) | |
| tree | 16de7bcf148a84d190a953a500469479d958665a /src/gui | |
| parent | 59d14a65cf36efcae7aecbd0af02efc30257ec97 (diff) | |
| download | manaplus-dc333fcd9b2840a3728266ba84384fa41ac4130d.tar.gz manaplus-dc333fcd9b2840a3728266ba84384fa41ac4130d.tar.bz2 manaplus-dc333fcd9b2840a3728266ba84384fa41ac4130d.tar.xz manaplus-dc333fcd9b2840a3728266ba84384fa41ac4130d.zip | |
Remove "blacklist" popup menu handler.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
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,20 +979,10 @@ 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); } else if (link == "enemy" && !mNick.empty()) @@ -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")); |