From b66d0b55a671af8193ae400920b0bf7bec82eae8 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Thu, 3 Dec 2009 16:56:18 -0700
Subject: Remove some unneeded _SUPPORt ifdefs

---
 src/map.cpp     | 4 ----
 src/map.h       | 2 --
 src/net/net.cpp | 5 +----
 3 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/map.cpp b/src/map.cpp
index 843b8308..ba54dcd1 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -464,7 +464,6 @@ bool Map::getWalk(int x, int y, unsigned char walkmask) const
     return !(mMetaTiles[x + y * mWidth].blockmask & walkmask);
 }
 
-#ifdef EATHENA_SUPPORT
 bool Map::occupied(int x, int y) const
 {
     const Beings &beings = beingManager->getAll();
@@ -479,7 +478,6 @@ bool Map::occupied(int x, int y) const
 
     return false;
 }
-#endif
 
 bool Map::contains(int x, int y) const
 {
@@ -611,14 +609,12 @@ Path Map::findPath(int startX, int startY, int destX, int destY,
                     ++Gcost;
                 }
 
-#ifdef EATHENA_SUPPORT
                 // It costs extra to walk through a being (needs to be enough
                 // to make it more attractive to walk around).
                 if (occupied(x, y))
                 {
                     Gcost += 3 * basicCost;
                 }
-#endif
 
                 // Skip if Gcost becomes too much
                 // Warning: probably not entirely accurate
diff --git a/src/map.h b/src/map.h
index 75c4bda4..b4a8c7af 100644
--- a/src/map.h
+++ b/src/map.h
@@ -229,12 +229,10 @@ class Map : public Properties
         bool getWalk(int x, int y,
                      unsigned char walkmask = BLOCKMASK_WALL) const;
 
-#ifdef EATHENA_SUPPORT
         /**
          * Tells whether a tile is occupied by a being.
          */
         bool occupied(int x, int y) const;
-#endif
 
         /**
          * Returns the width of this map in tiles.
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 337e55a1..9740844d 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -37,11 +37,8 @@
 #include "net/specialhandler.h"
 #include "net/tradehandler.h"
 
-#ifdef MANASERV_SUPPORT
-#include "net/manaserv/generalhandler.h"
-#else
 #include "net/ea/generalhandler.h"
-#endif
+#include "net/manaserv/generalhandler.h"
 
 Net::AdminHandler *adminHandler = NULL;
 Net::CharHandler *charHandler = NULL;
-- 
cgit v1.2.3-70-g09d2