From 14a6e6a4bc5d39ddf8f31efc07a5e2493a6f6d0a Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sat, 11 Apr 2009 08:58:32 -0600
Subject: Remove more support #ifdefs

---
 src/localplayer.h | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/localplayer.h')

diff --git a/src/localplayer.h b/src/localplayer.h
index c93368a5..1f3be912 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -165,12 +165,10 @@ class LocalPlayer : public Player
          */
         Inventory *getInventory() const { return mInventory; }
 
-#ifdef EATHENA_SUPPORT
         /**
          * Returns the player's storage
          */
         Inventory *getStorage() const { return mStorage; }
-#endif
 
 #ifdef TMWSERV_SUPPORT
         /**
@@ -268,9 +266,7 @@ class LocalPlayer : public Player
          */
         virtual void setGM();
 
-#ifdef EATHENA_SUPPORT
         void stopAttack();
-#endif
 
         /**
          * Overridden to do nothing. The attacks of the local player are
@@ -356,13 +352,13 @@ class LocalPlayer : public Player
          */
         void pickedUp(const std::string &item);
 
-#ifdef EATHENA_SUPPORT
         /**
          * Accessors for mInStorage
          */
         bool getInStorage() { return mInStorage; }
         void setInStorage(bool inStorage);
 
+#ifdef EATHENA_SUPPORT
         /**
          * Sets the amount of XP. Shows XP gaining effect if the player is on
          * a map.
@@ -488,12 +484,12 @@ class LocalPlayer : public Player
 
         void walk(unsigned char dir);
 
+        bool mInStorage;      /**< Whether storage is currently accessible */
 #ifdef EATHENA_SUPPORT
         int mXp;            /**< Experience points. */
-        bool mInStorage;      /**< Whether storage is currently accessible */
         int mTargetTime;      /** How long the being has been targeted **/
-        int mLastTarget;      /** Time stamp of last targeting action, -1 if none. */
 #endif
+        int mLastTarget;      /** Time stamp of last targeting action, -1 if none. */
 
 #ifdef TMWSERV_SUPPORT
         // Character status:
@@ -532,9 +528,7 @@ class LocalPlayer : public Player
                                   messages flooding */
 #endif
 
-#ifdef EATHENA_SUPPORT
         Inventory *mStorage;
-#endif
 
         // Load the target cursors into memory
         void initTargetCursor();
-- 
cgit v1.2.3-70-g09d2