summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorMatthias Hartmann <hartmann.matthias@gmail.com>2005-09-17 16:42:34 +0000
committerMatthias Hartmann <hartmann.matthias@gmail.com>2005-09-17 16:42:34 +0000
commitdb1f671668a615c5e1a4f48009708407bbac8d8c (patch)
treeb10ef65f484c27facc224bfc62c360e9caacaa7e /src/gui
parent7d7ea134637eb06e194068f157d3eead90115631 (diff)
downloadmana-client-db1f671668a615c5e1a4f48009708407bbac8d8c.tar.gz
mana-client-db1f671668a615c5e1a4f48009708407bbac8d8c.tar.bz2
mana-client-db1f671668a615c5e1a4f48009708407bbac8d8c.tar.xz
mana-client-db1f671668a615c5e1a4f48009708407bbac8d8c.zip
Added PVP
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popupmenu.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 77f74f4c..29b599aa 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -86,7 +86,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
const std::string &name = being->getName();
browserBox->addRow("@@trade|Trade With " + name + "@@");
- //browserBox->addRow("@@attack|Attack " + name + "@@");
+ browserBox->addRow("@@attack|Attack " + name + "@@");
//browserBox->addRow("@@follow|Follow " + name + "@@");
//browserBox->addRow("@@buddy|Add " + name + " to Buddy List@@");
}
@@ -151,6 +151,15 @@ void PopupMenu::handleLink(const std::string& link)
//tradePartner << "Trade: You and " << being->name<< "";
tradePartnerName = being->getName();
}
+
+ // Attack action
+ else if ((link == "attack") && being && being->getType() == Being::PLAYER)
+ {
+
+ autoTarget = being;
+ attack(being);
+ }
+
/*
// Follow Player action
else if (link == "follow")