summaryrefslogtreecommitdiff
path: root/src/localplayer.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-10-31 23:01:23 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-10-31 23:01:23 +0000
commit052cdbd8fce689b64371da82409bfd4e0f189f45 (patch)
tree316c8a69defc2a9ca69d9e3a4840de44db8d2382 /src/localplayer.h
parent6d928722369bc1db7f17d3fb0d0cb69ce304d39b (diff)
downloadmana-client-052cdbd8fce689b64371da82409bfd4e0f189f45.tar.gz
mana-client-052cdbd8fce689b64371da82409bfd4e0f189f45.tar.bz2
mana-client-052cdbd8fce689b64371da82409bfd4e0f189f45.tar.xz
mana-client-052cdbd8fce689b64371da82409bfd4e0f189f45.zip
Merged revisions 4071,4093,4100,4363 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4071 | the_enemy | 2008-04-11 16:12:30 +0200 (Fri, 11 Apr 2008) | 3 lines Players now need to click on the monster sprites rather than the tile. Players will now move to the target before attacking it. ........ r4093 | the_enemy | 2008-04-15 18:10:32 +0200 (Tue, 15 Apr 2008) | 1 line Fixed clicking near player. ........ r4100 | peaveydk | 2008-04-16 13:59:36 +0200 (Wed, 16 Apr 2008) | 1 line Cancel walking to a clicked monster if the target is lost while getting to it (killed or otherwise removed). ........ r4363 | crush_tmw | 2008-06-24 14:42:04 +0200 (Tue, 24 Jun 2008) | 1 line corrected date in changelog ........
Diffstat (limited to 'src/localplayer.h')
-rw-r--r--src/localplayer.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/localplayer.h b/src/localplayer.h
index 7a5158cc..b44ac14a 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -258,6 +258,16 @@ class LocalPlayer : public Player
{ return mWalkingDir; }
/**
+ * Sets going to being to attack
+ */
+ void setGotoTarget(Being *target);
+
+ /**
+ * Returns whether the target is in range to attack
+ */
+ bool withinAttackRange(Being *target);
+
+ /**
* Stops the player dead in his tracks
*/
void stopWalking(bool sendToServer = true);
@@ -377,6 +387,7 @@ class LocalPlayer : public Player
FloorItem *mPickUpTarget;
bool mTrading;
+ bool mGoingToTarget;
int mLastAction; /**< Time stamp of the last action, -1 if none. */
int mWalkingDir; /**< The direction the player is walking in. */
int mDestX; /**< X coordinate of destination. */