summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan Dombrowski <stefan@uni-bonn.de>2010-10-08 23:19:12 +0200
committerStefan Dombrowski <stefan@uni-bonn.de>2010-10-08 23:19:12 +0200
commit574bd5fa1ee45a7452d2e85941fa33f946b63eae (patch)
treee5cb67987ca716837fd498c5430b836250ca1497 /src
parentae7711813b236500c14d85de1c8a668a7beee0c1 (diff)
downloadmana-574bd5fa1ee45a7452d2e85941fa33f946b63eae.tar.gz
mana-574bd5fa1ee45a7452d2e85941fa33f946b63eae.tar.bz2
mana-574bd5fa1ee45a7452d2e85941fa33f946b63eae.tar.xz
mana-574bd5fa1ee45a7452d2e85941fa33f946b63eae.zip
Remove the following system
Removed due to unresolved social issues. In master it had been already removed by Kage in commit 89f192b9039f9c000515f0a12f4bb9fb55c4691c.
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp4
-rw-r--r--src/gui/popupmenu.cpp9
-rw-r--r--src/gui/viewport.cpp1
-rw-r--r--src/localplayer.cpp2
-rw-r--r--src/localplayer.h28
-rw-r--r--src/net/tmwa/beinghandler.cpp21
6 files changed, 0 insertions, 65 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 8e856dc0..66b6e3c4 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -778,26 +778,22 @@ void Game::handleInput()
(joystick && joystick->isUp()))
{
direction |= Being::UP;
- player_node->cancelFollow();
}
else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) ||
(joystick && joystick->isDown()))
{
direction |= Being::DOWN;
- player_node->cancelFollow();
}
if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) ||
(joystick && joystick->isLeft()))
{
direction |= Being::LEFT;
- player_node->cancelFollow();
}
else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) ||
(joystick && joystick->isRight()))
{
direction |= Being::RIGHT;
- player_node->cancelFollow();
}
if (keyboard.isKeyActive(keyboard.KEY_EMOTE) && direction != 0)
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 01870e62..409a0eda 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"),
@@ -249,12 +246,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 0b7cc0f8..b18b9b0b 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -431,7 +431,6 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
else
{
player_node->stopAttack();
- player_node->cancelFollow();
mPlayerFollowMouse = true;
// Make the player go to the mouse position
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 50a9462f..74ca5f0d 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -96,7 +96,6 @@ LocalPlayer::LocalPlayer(int id, int subtype):
mHp(1), mMaxHp(1),
mSkillPoints(0),
mTarget(NULL),
- mPlayerFollowed(""),
mPickUpTarget(NULL),
mTrading(false), mGoingToTarget(false), mKeepAttacking(false),
mLastAction(-1),
@@ -1432,7 +1431,6 @@ void LocalPlayer::changeAwayMode()
mAfkTime = 0;
if (mAwayMode)
{
- cancelFollow();
mAwayDialog = new OkDialog(_("Away"),
config.getValue("afkMessage", "I am away from keyboard"));
mAwayDialog->addActionListener(mAwayListener);
diff --git a/src/localplayer.h b/src/localplayer.h
index 2c06dfb5..03fec1f8 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -380,29 +380,6 @@ class LocalPlayer : public Player
void optionChanged(const std::string &value);
/**
- * set a following player by right clicking.
- */
- void setFollow(std::string player) { mPlayerFollowed = player; }
-
- /**
- * setting the next destination of the following, in case of warp
- */
- void setNextDest(int x, int y) { mNextDestX = x; mNextDestY = y; }
-
- int getNextDestX() const { return mNextDestX; }
- int getNextDestY() const { return mNextDestY; }
-
- /**
- * Stop following a player.
- */
- void cancelFollow() { mPlayerFollowed = ""; }
-
- /**
- * Get the playername followed by the current player.
- */
- std::string getFollow() const { return mPlayerFollowed; }
-
- /**
* Tells the engine wether to check
* if the Player Name is to be displayed.
*/
@@ -458,11 +435,6 @@ class LocalPlayer : public Player
Being *mTarget;
- /** Follow system **/
- std::string mPlayerFollowed;
- int mNextDestX;
- int mNextDestY;
-
FloorItem *mPickUpTarget;
bool mTrading;
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 889f8777..2fe962c7 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -115,7 +115,6 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
Being *srcBeing, *dstBeing;
Player *player = 0;
int hairStyle, hairColor, flag;
- std::string player_followed;
switch (msg.getId())
{
@@ -280,16 +279,6 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
if (!dstBeing)
break;
- player_followed = player_node->getFollow();
-
- if (!player_followed.empty())
- {
- if (dstBeing->getName() == player_followed)
- {
- player_node->setDestination(player_node->getNextDestX(), player_node->getNextDestY());
- }
- }
-
// If this is player's current target, clear it.
if (dstBeing == player_node->getTarget())
player_node->stopAttack();
@@ -595,16 +584,6 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
msg.readCoordinatePair(srcX, srcY, dstX, dstY);
dstBeing->setTileCoords(srcX, srcY);
dstBeing->setDestination(dstX, dstY);
-
- player_followed = player_node->getFollow();
- if (!player_followed.empty())
- {
- if (dstBeing->getName() == player_followed)
- {
- player_node->setNextDest(dstX, dstY);
- player_node->setDestination(srcX, srcY);
- }
- }
}
else
{