summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/being.cpp2
-rw-r--r--src/being.h2
-rw-r--r--src/localplayer.cpp6
-rw-r--r--src/localplayer.h18
4 files changed, 10 insertions, 18 deletions
diff --git a/src/being.cpp b/src/being.cpp
index 45a621e4..63b18dee 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -136,7 +136,7 @@ void Being::setPosition(const Vector &pos)
}
#ifdef EATHENA_SUPPORT
-void Being::setDestination(Uint16 destX, Uint16 destY)
+void Being::setDestination(int destX, int destY)
{
if (mMap)
setPath(mMap->findPath(mX, mY, destX, destY, getWalkMask()));
diff --git a/src/being.h b/src/being.h
index f670722c..5e17a1df 100644
--- a/src/being.h
+++ b/src/being.h
@@ -147,7 +147,7 @@ class Being : public Sprite, public ConfigListener
* Sets a new destination for this being to walk to.
*/
#ifdef EATHENA_SUPPORT
- virtual void setDestination(Uint16 destX, Uint16 destY);
+ virtual void setDestination(int destX, int destY);
#else
/**
* Creates a path for the being from current position to ex and ey
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 6c36fa1c..6ec334ed 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -458,11 +458,7 @@ void LocalPlayer::setTarget(Being *target)
static_cast<Monster *>(target)->setShowName(true);
}
-#ifdef MANASERV_SUPPORT
void LocalPlayer::setDestination(int x, int y)
-#else
-void LocalPlayer::setDestination(Uint16 x, Uint16 y)
-#endif
{
#ifdef MANASERV_SUPPORT
// Pre-computing character's destination in tiles
@@ -1159,4 +1155,4 @@ void LocalPlayer::optionChanged(const std::string &value)
{
setShowName(config.getValue("showownname", 1));
}
-} \ No newline at end of file
+}
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;