Unify eAthena and manaserv support in to one build.

Finish support for server types in the server dialog.
Using the new server type function, strip out ifdefs, replacing them with if
blocks for later merging in smaller atomic commits.
Remove any remaining references to the support defs, including in build system.

1 files changed, 11 insertions, 12 deletions

diff --git a/src/being.h b/src/being.h
index d7e9063f..747a5428 100644
--- a/src/being.h
+++ b/src/being.h
@@ -131,43 +131,42 @@ class Being : public Sprite, public ConfigListener
          */
         void clearPath();
 
-#ifdef EATHENA_SUPPORT
         /**
          * Returns the walk time.
          * Used to know which frame to display and trigger
          * the next Tile step.
+         * TODO: Used by eAthena only?
          */
         int getWalkTime() const { return mWalkTime; }
 
         /**
          * Set the current WalkTime value.
+         * TODO: Used by eAthena only?
          * @see Ea::BeingHandler that set it to tick time.
          */
         void setWalkTime(int walkTime) { mWalkTime = walkTime; }
 
         /**
          * Makes this being take the next step (tile) of its path.
+         * TODO: Used by eAthena only?
          */
         virtual void nextStep();
 
         /**
          * Get the current X pixel offset.
+         * TODO: Used by eAthena only?
          */
         int getXOffset() const
         { return getOffset(LEFT, RIGHT); }
 
         /**
          * Get the current Y pixel offset.
+         * TODO: Used by eAthena only?
          */
         int getYOffset() const
         { return getOffset(UP, DOWN); }
 
         /**
-         * Sets a new destination for this being to walk to.
-         */
-        virtual void setDestination(int destX, int destY);
-#elif MANASERV_SUPPORT
-        /**
          * Creates a path for the being from current position to ex and ey
          */
         void setDestination(int ex, int ey);
@@ -176,7 +175,6 @@ class Being : public Sprite, public ConfigListener
          * Returns the destination for this being.
          */
         const Vector &getDestination() const { return mDest; }
-#endif
 
         /**
          * Returns the tile x coord
@@ -580,10 +578,11 @@ class Being : public Sprite, public ConfigListener
         /** The current sprite Frame number to be displayed */
         int mFrame;
 
-#ifdef EATHENA_SUPPORT
-        /** Used to trigger the nextStep (walking on next Tile) */
+        /** Used to trigger the nextStep (walking on next Tile)
+         * TODO: Used by eAthena only?
+         */
         int mWalkTime;
-#endif
+
         int mEmotion;         /**< Currently showing emotion */
         int mEmotionTime;     /**< Time until emotion disappears */
         /** Time until the last speech sentence disappears */
@@ -630,13 +629,13 @@ class Being : public Sprite, public ConfigListener
         ParticleList mChildParticleEffects;
 
     private:
-#ifdef EATHENA_SUPPORT
+
         /**
          * Calculates the offset in the given directions.
          * If walking in direction 'neg' the value is negated.
+         * TODO: Used by eAthena only?
          */
         int getOffset(char pos, char neg) const;
-#endif
 
         /** Reset particle status effects on next redraw? */
         bool mMustResetParticles;