summaryrefslogtreecommitdiff
path: root/src/localplayer.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-01-21 23:23:26 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-01-21 23:40:27 +0100
commit7fa3653824e7aacf15aa4fc14f2465addc831851 (patch)
treeb8a4dbb0dc3461c494154d6f5c0a318fcac05838 /src/localplayer.h
parent762053a1547c32c2036f0d3647bfb8d19d009320 (diff)
downloadmana-client-7fa3653824e7aacf15aa4fc14f2465addc831851.tar.gz
mana-client-7fa3653824e7aacf15aa4fc14f2465addc831851.tar.bz2
mana-client-7fa3653824e7aacf15aa4fc14f2465addc831851.tar.xz
mana-client-7fa3653824e7aacf15aa4fc14f2465addc831851.zip
No point in differentiating between int and Uint16
Diffstat (limited to 'src/localplayer.h')
-rw-r--r--src/localplayer.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/localplayer.h b/src/localplayer.h
index fe3e3d98..75de274c 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -206,21 +206,17 @@ class LocalPlayer : public Player
* Returns the current target of the player. Returns 0 if no being is
* currently targeted.
*/
- Being* getTarget() const;
+ Being *getTarget() const;
/**
* Sets the target being of the player.
*/
- void setTarget(Being* target);
+ void setTarget(Being *target);
/**
* Sets a new destination for this being to walk to.
*/
-#ifdef MANASERV_SUPPORT
- void setDestination(int x, int y);
-#else
- virtual void setDestination(Uint16 x, Uint16 y);
-#endif
+ virtual void setDestination(int x, int y);
/**
* Sets a new direction to keep walking in.
@@ -374,7 +370,7 @@ class LocalPlayer : public Player
* Called when a option (set with config.addListener()) is changed
*/
void optionChanged(const std::string &value);
-
+
/**
* set a following player by right clicking.
*/
@@ -392,7 +388,7 @@ class LocalPlayer : public Player
* stops a following
*/
void cancelFollow() { mPlayerFollowed = ""; }
-
+
/**
* get following
*/
@@ -436,12 +432,12 @@ class LocalPlayer : public Player
int mGMLevel;
Being *mTarget;
-
+
/** Follow system **/
std::string mPlayerFollowed;
int mNextDestX;
int mNextDestY;
-
+
FloorItem *mPickUpTarget;
bool mTrading;