diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-05-13 22:14:56 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-05-13 22:14:56 +0300 |
| commit | 6b894220f3c029d256f7f15f41ecb2f635d25bde (patch) | |
| tree | a8c9b891f3f0df44440def2ea755fcf7454ddb32 /src/net | |
| parent | b4cd8029339cac3c577b67bd161b4dd3ab4f1530 (diff) | |
| download | manaplus-6b894220f3c029d256f7f15f41ecb2f635d25bde.tar.gz manaplus-6b894220f3c029d256f7f15f41ecb2f635d25bde.tar.bz2 manaplus-6b894220f3c029d256f7f15f41ecb2f635d25bde.tar.xz manaplus-6b894220f3c029d256f7f15f41ecb2f635d25bde.zip | |
Add more MANASERV_SUPPORT defines to disable server type checks, if manaserv disabled.
Fix some compilation warnings.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/messagein.cpp | 2 | ||||
| -rw-r--r-- | src/net/net.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/playerhandler.cpp | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 9ffc052f6..12d086207 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -115,7 +115,9 @@ void MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction) direction = 9; break; case 8: +#ifdef MANASERV_SUPPORT if (Net::getNetworkType() == ServerInfo::TMWATHENA) +#endif { direction = 8; break; diff --git a/src/net/net.cpp b/src/net/net.cpp index 7d530940a..052d65edc 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -160,8 +160,8 @@ void connectToServer(const ServerInfo &server) switch (server.type) { -#ifdef MANASERV_SUPPORT case ServerInfo::MANASERV: +#ifdef MANASERV_SUPPORT new ManaServ::GeneralHandler; break; #endif diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 5fb9d9508..4a9926cfd 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -731,6 +731,7 @@ void PlayerHandler::changeAction(Being::Action action) case Being::ATTACK: case Being::DEAD: case Being::HURT: + case Being::SPAWN: return; } |