summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popupmenu.cpp9
-rw-r--r--src/gui/viewport.cpp1
2 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index e6cd3f5b..21bab81e 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -126,9 +126,9 @@ void PopupMenu::showPopup(int x, int y, Being *being)
break;
}
- /*mBrowserBox->addRow(strprintf("@@follow|%s@@",
+ mBrowserBox->addRow(strprintf("@@follow|%s@@",
strprintf(_("Follow %s"),
- name.c_str()).c_str()));*/
+ name.c_str()).c_str()));
mBrowserBox->addRow(strprintf("@@guild|%s@@",
strprintf(_("Invite %s to join your guild"),
name.c_str()).c_str()));
@@ -263,11 +263,12 @@ void PopupMenu::handleLink(const std::string &link)
{
player_node->inviteToGuild(being);
}
- /*
+
// Follow Player action
else if (link == "follow")
{
- }*/
+ player_node->setFollow(being->getName());
+ }
// Pick Up Floor Item action
else if ((link == "pickup") && mFloorItem)
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index eb06ba0e..ec8cf341 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -390,6 +390,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
else
{
player_node->stopAttack();
+ player_node->cancelFollow();
mPlayerFollowMouse = true;
// Make the player go to the mouse position