From 4c6165ece76dff406d324c240a7fc099a3e0c42b Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sun, 10 Jan 2010 20:47:59 +0000 Subject: Remove some support ifdefs --- src/localplayer.h | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'src/localplayer.h') diff --git a/src/localplayer.h b/src/localplayer.h index 819b086d..00415ab9 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -101,13 +101,6 @@ enum class LocalPlayer : public Player { public: -#ifdef MANASERV_SUPPORT - enum Attribute - { - STR = 0, AGI, DEX, VIT, INT, WIL, CHR - }; -#endif - /** * Constructor. */ @@ -152,18 +145,14 @@ class LocalPlayer : public Player void inviteToGuild(Being *being); void clearInventory(); -#ifdef MANASERV_SUPPORT void setInvItem(int index, int id, int amount); -#endif void pickUp(FloorItem *item); -#ifdef EATHENA_SUPPORT /** * Sets the attack range. */ void setAttackRange(int range) { mAttackRange = range; } -#endif /** * Gets the attack range. @@ -282,10 +271,6 @@ class LocalPlayer : public Player bool getInStorage() { return mInStorage; } void setInStorage(bool inStorage); -#ifdef EATHENA_SUPPORT - Uint16 mAttackRange; -#endif - int getHp() const { return mHp; } @@ -301,7 +286,7 @@ class LocalPlayer : public Player void setLevel(int value); - void setExp(int value); + void setExp(int value, bool notify = true); int getExp() const { return mExp; } @@ -399,6 +384,8 @@ class LocalPlayer : public Player bool mInStorage; /**< Whether storage is currently accessible */ + Uint16 mAttackRange; + int mTargetTime; /** How long the being has been targeted **/ int mLastTarget; /** Time stamp of last targeting action, -1 if none. */ -- cgit v1.2.3-60-g2f50