diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-02-01 20:58:10 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-02-01 21:42:50 +0200 |
| commit | 954ceb91ddd94985594996d6d3c50be7b5652626 (patch) | |
| tree | 95b9a13368a5c561b380f34df95850276ec205ac /src/net | |
| parent | ba1c188f7a1850761eb7d63fbaaeece6dfb2a256 (diff) | |
| download | manaplus-954ceb91ddd94985594996d6d3c50be7b5652626.tar.gz manaplus-954ceb91ddd94985594996d6d3c50be7b5652626.tar.bz2 manaplus-954ceb91ddd94985594996d6d3c50be7b5652626.tar.xz manaplus-954ceb91ddd94985594996d6d3c50be7b5652626.zip | |
Add ability to enable/disable manaserv with embedded enet.
Set manaserv disabled in automake and cmake by default but enabled in build scripts.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/net.cpp | 5 | ||||
| -rw-r--r-- | src/net/serverinfo.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp index 36e414643..862505fdb 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -41,7 +41,9 @@ #include "net/tmwa/generalhandler.h" +#ifdef MANASERV_SUPPORT #include "net/manaserv/generalhandler.h" +#endif Net::AdminHandler *adminHandler = NULL; Net::CharHandler *charHandler = NULL; @@ -157,10 +159,11 @@ void connectToServer(const ServerInfo &server) switch (server.type) { +#ifdef MANASERV_SUPPORT case ServerInfo::MANASERV: new ManaServ::GeneralHandler; break; - +#endif case ServerInfo::TMWATHENA: new TmwAthena::GeneralHandler; break; diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index 113d8a9b2..74d537b80 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -105,9 +105,10 @@ public: // Used for backward compatibility else if (compareStrI(type, "eathena") == 0) return TMWATHENA; +#ifdef MANASERV_SUPPORT else if (compareStrI(type, "manaserv") == 0) return MANASERV; - +#endif return UNKNOWN; } }; |