diff options
| author | Bertram <bertram@cegetel.net> | 2009-10-02 00:14:27 +0200 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2009-10-02 00:14:27 +0200 |
| commit | d974f23b42ddeca3c9cf0d8489dc38d8524c5f12 (patch) | |
| tree | 4121f55a7f3791a6ac3beb2fb36822b7e6abc859 | |
| parent | 06cdcf330ac656a94c03bb4e24a06bea090aa63a (diff) | |
| download | mana-d974f23b42ddeca3c9cf0d8489dc38d8524c5f12.tar.gz mana-d974f23b42ddeca3c9cf0d8489dc38d8524c5f12.tar.bz2 mana-d974f23b42ddeca3c9cf0d8489dc38d8524c5f12.tar.xz mana-d974f23b42ddeca3c9cf0d8489dc38d8524c5f12.zip | |
Removed non hurting eAthena ifdefs.
| -rw-r--r-- | src/localplayer.cpp | 6 | ||||
| -rw-r--r-- | src/localplayer.h | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 6f4b6303..b5ad79eb 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -87,9 +87,7 @@ LocalPlayer::LocalPlayer(int id, int job, Map *map): #endif mEquipment(new Equipment), mInStorage(false), -#ifdef EATHENA_SUPPORT mTargetTime(-1), -#endif mLastTarget(-1), mCharacterPoints(0), mCorrectionPoints(0), @@ -192,7 +190,6 @@ void LocalPlayer::logic() } mSpecialRechargeUpdateNeeded++; -#ifdef EATHENA_SUPPORT // Targeting allowed 4 times a second if (get_elapsed_time(mLastTarget) >= 250) mLastTarget = -1; @@ -204,7 +201,6 @@ void LocalPlayer::logic() setTarget(NULL); mLastTarget = -1; } -#endif if (mTarget) { @@ -461,7 +457,6 @@ Being *LocalPlayer::getTarget() const void LocalPlayer::setTarget(Being *target) { -#ifdef EATHENA_SUPPORT if (mLastTarget != -1 || target == this) return; @@ -479,7 +474,6 @@ void LocalPlayer::setTarget(Being *target) mKeepAttacking = false; mTargetTime = -1; } -#endif if (mTarget) mTarget->untarget(); diff --git a/src/localplayer.h b/src/localplayer.h index 691307ba..f0bb889d 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -387,9 +387,8 @@ class LocalPlayer : public Player void walk(unsigned char dir); bool mInStorage; /**< Whether storage is currently accessible */ -#ifdef EATHENA_SUPPORT + int mTargetTime; /** How long the being has been targeted **/ -#endif int mLastTarget; /** Time stamp of last targeting action, -1 if none. */ // Character status: |