From 052cdbd8fce689b64371da82409bfd4e0f189f45 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Fri, 31 Oct 2008 23:01:23 +0000 Subject: 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 ........ --- src/localplayer.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/localplayer.h') diff --git a/src/localplayer.h b/src/localplayer.h index 7a5158cc..b44ac14a 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -257,6 +257,16 @@ class LocalPlayer : public Player int getWalkingDir() const { 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 */ @@ -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. */ -- cgit v1.2.3-60-g2f50