diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-04-10 16:35:40 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-04-16 23:17:21 +0200 |
| commit | 76188096f64b8cc600d2f18cbf7a4d0c7ae87136 (patch) | |
| tree | 5ad9c60e6a0fc0ce3e4dc93e7d0c1ec4eebaf041 | |
| parent | e43b1bf752829b9e0d612c0727c666f9508b93bc (diff) | |
| download | mana-client-76188096f64b8cc600d2f18cbf7a4d0c7ae87136.tar.gz mana-client-76188096f64b8cc600d2f18cbf7a4d0c7ae87136.tar.bz2 mana-client-76188096f64b8cc600d2f18cbf7a4d0c7ae87136.tar.xz mana-client-76188096f64b8cc600d2f18cbf7a4d0c7ae87136.zip | |
Removed ENet version checks since only 1.3 should be used anyway
Reviewed-by: Stefan Dombrowski
| -rw-r--r-- | src/net/manaserv/connection.cpp | 4 | ||||
| -rw-r--r-- | src/net/manaserv/connection.h | 6 | ||||
| -rw-r--r-- | src/net/manaserv/network.cpp | 4 |
3 files changed, 0 insertions, 14 deletions
diff --git a/src/net/manaserv/connection.cpp b/src/net/manaserv/connection.cpp index b404191f..4b421a04 100644 --- a/src/net/manaserv/connection.cpp +++ b/src/net/manaserv/connection.cpp @@ -60,11 +60,7 @@ bool Connection::connect(const std::string &address, short port) enetAddress.port = port; // Initiate the connection, allocating channel 0. -#if defined(ENET_VERSION) && ENET_VERSION >= ENET_CUTOFF mConnection = enet_host_connect(mClient, &enetAddress, 1, 0); -#else - mConnection = enet_host_connect(mClient, &enetAddress, 1); -#endif if (!mConnection) { diff --git a/src/net/manaserv/connection.h b/src/net/manaserv/connection.h index 808a6d40..b39f8957 100644 --- a/src/net/manaserv/connection.h +++ b/src/net/manaserv/connection.h @@ -26,12 +26,6 @@ #include <iosfwd> -#ifdef ENET_VERSION_CREATE -#define ENET_CUTOFF ENET_VERSION_CREATE(1,3,0) -#else -#define ENET_CUTOFF 0xFFFFFFFF -#endif - namespace ManaServ { class MessageOut; diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp index a5bf6186..03bd7b28 100644 --- a/src/net/manaserv/network.cpp +++ b/src/net/manaserv/network.cpp @@ -53,11 +53,7 @@ void initialize() logger->error("Failed to initialize ENet."); } -#if defined(ENET_VERSION) && ENET_VERSION >= ENET_CUTOFF client = enet_host_create(NULL, 3, 0, 0, 0); -#else - client = enet_host_create(NULL, 3, 0, 0); -#endif if (!client) { |