diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-05-19 02:24:20 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-05-19 02:24:20 +0300 |
| commit | 886522371299b45254b7dc72e6de3070703d7c10 (patch) | |
| tree | 738745eab76eb5f55a9adc08bfac10077b07efac /src/localplayer.cpp | |
| parent | 7cd309e7c9e0200cedb45edfeeba5a601d3fb446 (diff) | |
| download | mv-886522371299b45254b7dc72e6de3070703d7c10.tar.gz mv-886522371299b45254b7dc72e6de3070703d7c10.tar.bz2 mv-886522371299b45254b7dc72e6de3070703d7c10.tar.xz mv-886522371299b45254b7dc72e6de3070703d7c10.zip | |
Enable server type selection again. Add evol server type. Now working same as tmweathena.
Diffstat (limited to 'src/localplayer.cpp')
| -rw-r--r-- | src/localplayer.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index ebd28e43c..2a3048a3d 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -772,7 +772,7 @@ Position LocalPlayer::getNextWalkPosition(unsigned char dir) void LocalPlayer::nextTile(unsigned char dir _UNUSED_ = 0) { #ifdef MANASERV_SUPPORT - if (Net::getNetworkType() == ServerInfo::TMWATHENA) + if (Net::getNetworkType() != ServerInfo::MANASERV) #endif { // updatePos(); @@ -1028,7 +1028,7 @@ void LocalPlayer::setDestination(int x, int y) // If the destination given to being class is accepted, // we inform the Server. if ((x == mDest.x && y == mDest.y) - || Net::getNetworkType() == ServerInfo::TMWATHENA) + || Net::getNetworkType() != ServerInfo::MANASERV) #endif { Net::getPlayerHandler()->setDestination(x, y, mDirection); @@ -1123,7 +1123,7 @@ void LocalPlayer::startWalking(unsigned char dir) dx++; #ifdef MANASERV_SUPPORT - if (Net::getNetworkType() == ServerInfo::TMWATHENA) + if (Net::getNetworkType() != ServerInfo::MANASERV) #endif { // Prevent skipping corners over colliding tiles @@ -1333,7 +1333,11 @@ void LocalPlayer::attack(Being *target, bool keep, bool dontChangeEquipment) changeEquipmentBeforeAttack(target); Net::getPlayerHandler()->attack(target->getId(), mServerAttack); - if ((Net::getNetworkType() == ServerInfo::TMWATHENA) && !keep) +#ifdef MANASERV_SUPPORT + if ((Net::getNetworkType() != ServerInfo::MANASERV) && !keep) +#else + if (!keep) +#endif stopAttack(); } |