From 17631dacf2cb8ebc3acc1dae9df0729a80a150d9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 2 Nov 2011 03:02:25 +0300 Subject: Add enemy relation. --- src/gui/chatwindow.cpp | 1 + src/gui/popupmenu.cpp | 43 +++++++++++++++++++++++++++++++++++++++++++ src/gui/setup_relations.cpp | 3 ++- 3 files changed, 46 insertions(+), 1 deletion(-) (limited to 'src/gui') diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 1fa91cfa6..cdcd02bc3 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -294,6 +294,7 @@ void ChatWindow::fillCommands() mCommands.push_back("/removeattack "); mCommands.push_back("/addignoreattack "); mCommands.push_back("/blacklist "); + mCommands.push_back("/enemy "); mCommands.push_back("/serverignoreall"); mCommands.push_back("/serverunignoreall"); mCommands.push_back("/dumpg"); diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index d7c7e54df..a457573ce 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -145,6 +145,7 @@ void PopupMenu::showPopup(int x, int y, Being *being) mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); mBrowserBox->addRow("blacklist", _("Black list")); + mBrowserBox->addRow("enemy", _("Set as enemy")); mBrowserBox->addRow("erase", _("Erase")); break; @@ -152,6 +153,7 @@ void PopupMenu::showPopup(int x, int y, Being *being) mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); mBrowserBox->addRow("blacklist", _("Black list")); + mBrowserBox->addRow("enemy", _("Set as enemy")); mBrowserBox->addRow("erase", _("Erase")); break; @@ -159,6 +161,15 @@ void PopupMenu::showPopup(int x, int y, Being *being) mBrowserBox->addRow("unignore", _("Unignore")); mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("enemy", _("Set as enemy")); + mBrowserBox->addRow("erase", _("Erase")); + break; + + case PlayerRelation::ENEMY2: + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("blacklist", _("Black list")); mBrowserBox->addRow("erase", _("Erase")); break; @@ -379,6 +390,7 @@ void PopupMenu::showPlayerPopup(int x, int y, std::string nick) mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); mBrowserBox->addRow("blacklist", _("Black list")); + mBrowserBox->addRow("enemy", _("Set as enemy")); mBrowserBox->addRow("erase", _("Erase")); break; @@ -386,6 +398,7 @@ void PopupMenu::showPlayerPopup(int x, int y, std::string nick) mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); mBrowserBox->addRow("blacklist", _("Black list")); + mBrowserBox->addRow("enemy", _("Set as enemy")); mBrowserBox->addRow("erase", _("Erase")); break; @@ -393,6 +406,7 @@ void PopupMenu::showPlayerPopup(int x, int y, std::string nick) mBrowserBox->addRow("unignore", _("Unignore")); mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("enemy", _("Set as enemy")); mBrowserBox->addRow("erase", _("Erase")); break; @@ -407,6 +421,14 @@ void PopupMenu::showPlayerPopup(int x, int y, std::string nick) mBrowserBox->addRow("erase", _("Erase")); break; + case PlayerRelation::ENEMY2: + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("blacklist", _("Black list")); + mBrowserBox->addRow("erase", _("Erase")); + break; + case PlayerRelation::ERASED: mBrowserBox->addRow("unignore", _("Unignore")); mBrowserBox->addRow("disregard", _("Disregard")); @@ -625,6 +647,7 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab) mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); mBrowserBox->addRow("blacklist", _("Black list")); + mBrowserBox->addRow("enemy", _("Set as enemy")); mBrowserBox->addRow("erase", _("Erase")); break; @@ -632,6 +655,7 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab) mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); mBrowserBox->addRow("blacklist", _("Black list")); + mBrowserBox->addRow("enemy", _("Set as enemy")); mBrowserBox->addRow("erase", _("Erase")); break; @@ -639,6 +663,7 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab) mBrowserBox->addRow("unignore", _("Unignore")); mBrowserBox->addRow("disregard", _("Disregard")); mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("enemy", _("Set as enemy")); mBrowserBox->addRow("erase", _("Erase")); break; @@ -648,6 +673,14 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab) mBrowserBox->addRow("erase", _("Erase")); break; + case PlayerRelation::ENEMY2: + mBrowserBox->addRow("unignore", _("Unignore")); + mBrowserBox->addRow("disregard", _("Disregard")); + mBrowserBox->addRow("ignore", _("Ignore")); + mBrowserBox->addRow("blacklist", _("Black list")); + mBrowserBox->addRow("erase", _("Erase")); + break; + case PlayerRelation::IGNORED: mBrowserBox->addRow("unignore", _("Unignore")); mBrowserBox->addRow("erase", _("Erase")); @@ -895,6 +928,16 @@ void PopupMenu::handleLink(const std::string &link, { player_relations.setRelation(mNick, PlayerRelation::BLACKLISTED); } + else if (link == "enemy" && being && + being->getType() == ActorSprite::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() == ActorSprite::PLAYER) { diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp index 6c57d981e..73fd34e27 100644 --- a/src/gui/setup_relations.cpp +++ b/src/gui/setup_relations.cpp @@ -72,7 +72,8 @@ static const char *RELATION_NAMES[PlayerRelation::RELATIONS_NR] = N_("Disregarded"), N_("Ignored"), N_("Erased"), - N_("Blacklisted") + N_("Blacklisted"), + N_("Enemy") }; class PlayerRelationListModel : public gcn::ListModel -- cgit v1.2.3-60-g2f50