diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-07-28 16:03:59 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-07-28 16:34:59 +0300 |
commit | b96e6eeba6e1511568c8291bd8cb6a6d3706635c (patch) | |
tree | d021843c88d856f86f018547c30f1181290ffcbe /src/net/net.cpp | |
parent | 60859a71dd9794b0216cc7a60146d417e06dbbad (diff) | |
download | manaverse-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.gz manaverse-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.bz2 manaverse-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.tar.xz manaverse-b96e6eeba6e1511568c8291bd8cb6a6d3706635c.zip |
Remove define EATHENA_SUPPORT from all code.
Now eathena like support enabled always.
Diffstat (limited to 'src/net/net.cpp')
-rw-r--r-- | src/net/net.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp index ca2d07838..9b6be857a 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -30,15 +30,12 @@ #include "net/tmwa/generalhandler.h" #endif -#ifdef EATHENA_SUPPORT #include "net/eathena/generalhandler.h" -#endif #include "debug.h" namespace Net { -#ifdef EATHENA_SUPPORT class AuctionHandler; class BankHandler; class BattleGroundHandler; @@ -55,7 +52,6 @@ namespace Net class SearchStoreHandler; class RouletteHandler; class VendingHandler; -#endif class AdminHandler; class BeingHandler; class BuySellHandler; @@ -91,7 +87,6 @@ Net::TradeHandler *tradeHandler = nullptr; Net::BeingHandler *beingHandler = nullptr; Net::BuySellHandler *buySellHandler = nullptr; Net::ServerFeatures *serverFeatures = nullptr; -#ifdef EATHENA_SUPPORT Net::AuctionHandler *auctionHandler = nullptr; Net::BankHandler *bankHandler = nullptr; Net::BattleGroundHandler *battleGroundHandler = nullptr; @@ -108,7 +103,6 @@ Net::MercenaryHandler *mercenaryHandler = nullptr; Net::RouletteHandler *rouletteHandler = nullptr; Net::SearchStoreHandler *searchStoreHandler = nullptr; Net::VendingHandler *vendingHandler = nullptr; -#endif Net::QuestHandler *questHandler = nullptr; namespace Net @@ -132,11 +126,7 @@ void connectToServer(const ServerInfo &server) { case ServerType::EATHENA: case ServerType::EVOL2: -#ifdef EATHENA_SUPPORT new EAthena::GeneralHandler; -#else - new TmwAthena::GeneralHandler; -#endif break; case ServerType::TMWATHENA: case ServerType::UNKNOWN: |