diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-12-03 16:56:18 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-12-03 16:56:18 -0700 |
| commit | b66d0b55a671af8193ae400920b0bf7bec82eae8 (patch) | |
| tree | d38e71dae0485096ba4d24cf53101c57a0287d50 | |
| parent | 53a6f9d15f3b3690d5ced9251f38608bf5585980 (diff) | |
| download | mana-b66d0b55a671af8193ae400920b0bf7bec82eae8.tar.gz mana-b66d0b55a671af8193ae400920b0bf7bec82eae8.tar.bz2 mana-b66d0b55a671af8193ae400920b0bf7bec82eae8.tar.xz mana-b66d0b55a671af8193ae400920b0bf7bec82eae8.zip | |
Remove some unneeded _SUPPORt ifdefs
| -rw-r--r-- | src/map.cpp | 4 | ||||
| -rw-r--r-- | src/map.h | 2 | ||||
| -rw-r--r-- | src/net/net.cpp | 5 |
3 files changed, 1 insertions, 10 deletions
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 @@ -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; |