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, 0 insertions, 10 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index e2257388..3d389374 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -125,9 +125,6 @@ void PopupMenu::showPopup(int x, int y, Being *being)
break;
}
- mBrowserBox->addRow(strprintf("@@follow|%s@@",
- strprintf(_("Follow %s"),
- name.c_str()).c_str()));
if (player_node->getNumberOfGuilds())
mBrowserBox->addRow(strprintf("@@guild|%s@@",
strprintf(_("Invite %s to join your guild"),
@@ -255,12 +252,6 @@ void PopupMenu::handleLink(const std::string &link)
player_node->inviteToGuild(being);
}
- // Follow Player action
- else if (link == "follow" && being)
- {
- 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 972920a5..0209b13f 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -413,7 +413,6 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
else
{
player_node->stopAttack();
- player_node->cancelFollow();
mPlayerFollowMouse = true;
// Make the player go to the mouse position