From 6b894220f3c029d256f7f15f41ecb2f635d25bde Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 13 May 2011 22:14:56 +0300
Subject: Add more MANASERV_SUPPORT defines to disable server type checks, if
 manaserv disabled. Fix some compilation warnings.

---
 src/net/messagein.cpp          | 2 ++
 src/net/net.cpp                | 2 +-
 src/net/tmwa/playerhandler.cpp | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/net')

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;
     }
 
-- 
cgit v1.2.3-70-g09d2