diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-12-11 21:50:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-12-11 21:50:58 +0300 |
| commit | 30b486f4155f69471a19422656a25c3d902aff28 (patch) | |
| tree | 28c3d38e8debf817d4ac1755f3e441f145ea0fd2 /src | |
| parent | dc333fcd9b2840a3728266ba84384fa41ac4130d (diff) | |
| download | plus-30b486f4155f69471a19422656a25c3d902aff28.tar.gz plus-30b486f4155f69471a19422656a25c3d902aff28.tar.bz2 plus-30b486f4155f69471a19422656a25c3d902aff28.tar.xz plus-30b486f4155f69471a19422656a25c3d902aff28.zip | |
Remove "enemy" popup menu handler.
Diffstat (limited to 'src')
| -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 f94a75ee6..b95f1d41e 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -979,19 +979,9 @@ void PopupMenu::handleLink(const std::string &link, if (actorManager) being = actorManager->findBeing(mBeingId); - if (link == "enemy" && being && + if (link == "erase" && being && being->getType() == ActorType::Player) { - player_relations.setRelation(being->getName(), - PlayerRelation::ENEMY2); - } - else if (link == "enemy" && !mNick.empty()) - { - player_relations.setRelation(mNick, PlayerRelation::ENEMY2); - } - else if (link == "erase" && being && - being->getType() == ActorType::Player) - { player_relations.setRelation(being->getName(), PlayerRelation::ERASED); being->updateName(); } @@ -2613,7 +2603,7 @@ void PopupMenu::addNormalRelations() mBrowserBox->addRow("/blacklist 'NAME'", _("Black list")); // TRANSLATORS: popup menu item // TRANSLATORS: add player to enemy list - mBrowserBox->addRow("enemy", _("Set as enemy")); + mBrowserBox->addRow("/enemy 'NAME'", _("Set as enemy")); // TRANSLATORS: popup menu item // TRANSLATORS: add player to erased list mBrowserBox->addRow("erase", _("Erase")); @@ -2646,7 +2636,7 @@ void PopupMenu::addPlayerRelation(const std::string &name) mBrowserBox->addRow("/ignore 'NAME'", _("Ignore")); // TRANSLATORS: popup menu item // TRANSLATORS: add player to enemy list - mBrowserBox->addRow("enemy", _("Set as enemy")); + mBrowserBox->addRow("/enemy 'NAME'", _("Set as enemy")); // TRANSLATORS: popup menu item // TRANSLATORS: add player to erased list mBrowserBox->addRow("erase", _("Erase")); |