diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-27 13:25:41 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-27 13:25:41 +0300 |
| commit | c61f1b6abe8e68995f00ae3a939afe5049e5cdb3 (patch) | |
| tree | c50613a2c7722fba4aba9d5a67949b118a279b33 /src/actormanager.cpp | |
| parent | b481cd74dfd1629ca7b045cde57562e752c49638 (diff) | |
| download | manaverse-c61f1b6abe8e68995f00ae3a939afe5049e5cdb3.tar.gz manaverse-c61f1b6abe8e68995f00ae3a939afe5049e5cdb3.tar.bz2 manaverse-c61f1b6abe8e68995f00ae3a939afe5049e5cdb3.tar.xz manaverse-c61f1b6abe8e68995f00ae3a939afe5049e5cdb3.zip | |
Remove manaserv ifdefs code.
ManaServ was already depricated long ago.
Diffstat (limited to 'src/actormanager.cpp')
| -rw-r--r-- | src/actormanager.cpp | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 9661dc2fe..72ab8c21c 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -137,23 +137,10 @@ class SortBeingFunctor final return being1->getDistance() < being2->getDistance(); } - int d1, d2; -#ifdef MANASERV_SUPPORT - if (Net::getNetworkType() == ServerInfo::MANASERV) - { - const Vector &pos1 = being1->getPosition(); - d1 = abs((static_cast<int>(pos1.x)) - x) - + abs((static_cast<int>(pos1.y)) - y); - const Vector &pos2 = being2->getPosition(); - d2 = abs((static_cast<int>(pos2.x)) - x) - + abs((static_cast<int>(pos2.y)) - y); - } - else -#endif - { - d1 = abs(being1->getTileX() - x) + abs(being1->getTileY() - y); - d2 = abs(being2->getTileX() - x) + abs(being2->getTileY() - y); - } + const int d1 = abs(being1->getTileX() - x) + + abs(being1->getTileY() - y); + const int d2 = abs(being2->getTileX() - x) + + abs(being2->getTileY() - y); if (d1 != d2) return d1 < d2; |