Remove define EATHENA_SUPPORT from all code.

Now eathena like support enabled always.

59 files changed, 1 insertions, 183 deletions

diff --git a/src/net/auctionhandler.h b/src/net/auctionhandler.h
index 75057740c..65b9ed1f2 100644
--- a/src/net/auctionhandler.h
+++ b/src/net/auctionhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_AUCTIONHANDLER_H
 #define NET_AUCTIONHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "enums/net/auctionsearchtype.h"
 
 #include <string>
@@ -70,5 +68,4 @@ class AuctionHandler notfinal
 
 extern Net::AuctionHandler *auctionHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_AUCTIONHANDLER_H
diff --git a/src/net/bankhandler.h b/src/net/bankhandler.h
index 5853e84c9..f469aa320 100644
--- a/src/net/bankhandler.h
+++ b/src/net/bankhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_BANKHANDLER_H
 #define NET_BANKHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "localconsts.h"
 
 namespace Net
@@ -49,5 +47,4 @@ class BankHandler notfinal
 
 extern Net::BankHandler *bankHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_BANKHANDLER_H
diff --git a/src/net/battlegroundhandler.h b/src/net/battlegroundhandler.h
index fb24e8243..2706e7ce8 100644
--- a/src/net/battlegroundhandler.h
+++ b/src/net/battlegroundhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_BATTLEGROUNDHANDLER_H
 #define NET_BATTLEGROUNDHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "enums/net/battlegroundtype.h"
 
 #include <string>
@@ -54,5 +52,4 @@ class BattleGroundHandler notfinal
 
 extern Net::BattleGroundHandler *battleGroundHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_BATTLEGROUNDHANDLER_H
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index ac8495a5b..ea2f36030 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -41,11 +41,9 @@ class BeingHandler notfinal
 
         virtual void undress(Being *const being) const = 0;
 
-#ifdef EATHENA_SUPPORT
         virtual void requestRanks(const RankT rank) const = 0;
 
         virtual void viewPlayerEquipment(const Being *const being) const = 0;
-#endif
 };
 
 }  // namespace Net
diff --git a/src/net/buyingstorehandler.h b/src/net/buyingstorehandler.h
index 3d994b2bc..74dcc5f6b 100644
--- a/src/net/buyingstorehandler.h
+++ b/src/net/buyingstorehandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_BUYINGSTOREHANDLER_H
 #define NET_BUYINGSTOREHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include <string>
 #include <vector>
 
@@ -60,5 +58,4 @@ class BuyingStoreHandler notfinal
 
 extern Net::BuyingStoreHandler *buyingStoreHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_BUYINGSTOREHANDLER_H
diff --git a/src/net/cashshophandler.h b/src/net/cashshophandler.h
index 2c4df7073..f66d29297 100644
--- a/src/net/cashshophandler.h
+++ b/src/net/cashshophandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_CASHSHOPHANDLER_H
 #define NET_CASHSHOPHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "enums/simpletypes/itemcolor.h"
 
 #include <vector>
@@ -60,5 +58,4 @@ class CashShopHandler notfinal
 
 extern Net::CashShopHandler *cashShopHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_CASHSHOPHANDLER_H
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 9a3b5a442..408b1bcb5 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -87,12 +87,10 @@ size_t InventoryHandler::getSize(const InventoryTypeT type) const
         case InventoryType::Trade:
             return 12;
         case InventoryType::Npc:
-#ifdef EATHENA_SUPPORT
         case InventoryType::Cart:
         case InventoryType::Vending:
         case InventoryType::Mail:
         case InventoryType::Craft:
-#endif
         case InventoryType::TypeEnd:
         default:
             return 0;
diff --git a/src/net/eathena/auctionhandler.h b/src/net/eathena/auctionhandler.h
index b7c15125f..208460daa 100644
--- a/src/net/eathena/auctionhandler.h
+++ b/src/net/eathena/auctionhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_AUCTIONHANDLER_H
 #define NET_EATHENA_AUCTIONHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/auctionhandler.h"
 
 namespace EAthena
@@ -62,5 +60,4 @@ class AuctionHandler final : public Net::AuctionHandler
 
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_AUCTIONHANDLER_H
diff --git a/src/net/eathena/auctionrecv.h b/src/net/eathena/auctionrecv.h
index 9858e19ea..9a60dc515 100644
--- a/src/net/eathena/auctionrecv.h
+++ b/src/net/eathena/auctionrecv.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_AUCTIONRECV_H
 #define NET_EATHENA_AUCTIONRECV_H
 
-#ifdef EATHENA_SUPPORT
-
 namespace Net
 {
     class MessageIn;
@@ -40,5 +38,4 @@ namespace EAthena
     }  // namespace Admin
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_AUCTIONRECV_H
diff --git a/src/net/eathena/bankhandler.h b/src/net/eathena/bankhandler.h
index 252620045..0935c21b8 100644
--- a/src/net/eathena/bankhandler.h
+++ b/src/net/eathena/bankhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_BANKHANDLER_H
 #define NET_EATHENA_BANKHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/bankhandler.h"
 
 namespace EAthena
@@ -47,5 +45,4 @@ class BankHandler final : public Net::BankHandler
 
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_BANKHANDLER_H
diff --git a/src/net/eathena/bankrecv.h b/src/net/eathena/bankrecv.h
index 5d4d65032..39ca6ba59 100644
--- a/src/net/eathena/bankrecv.h
+++ b/src/net/eathena/bankrecv.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_BANKRECV_H
 #define NET_EATHENA_BANKRECV_H
 
-#ifdef EATHENA_SUPPORT
-
 namespace Net
 {
     class MessageIn;
@@ -38,5 +36,4 @@ namespace EAthena
     }  // namespace BankRecv
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_BANKRECV_H
diff --git a/src/net/eathena/battlegroundhandler.h b/src/net/eathena/battlegroundhandler.h
index b87420d3f..c51e3af8b 100644
--- a/src/net/eathena/battlegroundhandler.h
+++ b/src/net/eathena/battlegroundhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_BATTLEGROUNDHANDLER_H
 #define NET_EATHENA_BATTLEGROUNDHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/battlegroundhandler.h"
 
 namespace EAthena
@@ -48,5 +46,4 @@ class BattleGroundHandler final : public Net::BattleGroundHandler
 
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_BATTLEGROUNDHANDLER_H
diff --git a/src/net/eathena/battlegroundrecv.h b/src/net/eathena/battlegroundrecv.h
index 59b3e18ce..ef7de8a1c 100644
--- a/src/net/eathena/battlegroundrecv.h
+++ b/src/net/eathena/battlegroundrecv.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_BATTLEGROUNDRECV_H
 #define NET_EATHENA_BATTLEGROUNDRECV_H
 
-#ifdef EATHENA_SUPPORT
-
 namespace Net
 {
     class MessageIn;
@@ -45,5 +43,4 @@ namespace EAthena
     }  // namespace BattleGroundRecv
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_BATTLEGROUNDRECV_H
diff --git a/src/net/eathena/buyingstorehandler.h b/src/net/eathena/buyingstorehandler.h
index f271dc60d..2ccf9792f 100644
--- a/src/net/eathena/buyingstorehandler.h
+++ b/src/net/eathena/buyingstorehandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_BUYINGSTOREHANDLER_H
 #define NET_EATHENA_BUYINGSTOREHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/buyingstorehandler.h"
 
 namespace EAthena
@@ -51,5 +49,4 @@ class BuyingStoreHandler final : public Net::BuyingStoreHandler
 
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_BUYINGSTOREHANDLER_H
diff --git a/src/net/eathena/buyingstorerecv.h b/src/net/eathena/buyingstorerecv.h
index ea0f76b00..82b9182a6 100644
--- a/src/net/eathena/buyingstorerecv.h
+++ b/src/net/eathena/buyingstorerecv.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_BUYINGSTORERECV_H
 #define NET_EATHENA_BUYINGSTORERECV_H
 
-#ifdef EATHENA_SUPPORT
-
 namespace Net
 {
     class MessageIn;
@@ -54,5 +52,4 @@ namespace EAthena
     }  // namespace BuyingStoreRecv
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_BUYINGSTORERECV_H
diff --git a/src/net/eathena/cashshophandler.h b/src/net/eathena/cashshophandler.h
index 7d7fe1fbc..98030fa54 100644
--- a/src/net/eathena/cashshophandler.h
+++ b/src/net/eathena/cashshophandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_CASHSHOPHANDLER_H
 #define NET_EATHENA_CASHSHOPHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/cashshophandler.h"
 
 namespace EAthena
@@ -53,5 +51,4 @@ class CashShopHandler final : public Net::CashShopHandler
 
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_CASHSHOPHANDLER_H
diff --git a/src/net/eathena/cashshoprecv.h b/src/net/eathena/cashshoprecv.h
index d302d5b6b..ad0dcd7ac 100644
--- a/src/net/eathena/cashshoprecv.h
+++ b/src/net/eathena/cashshoprecv.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_CASHSHOPRECV_H
 #define NET_EATHENA_CASHSHOPRECV_H
 
-#ifdef EATHENA_SUPPORT
-
 namespace Net
 {
     class MessageIn;
@@ -44,5 +42,4 @@ namespace EAthena
     }  // namespace CashShopRecv
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_CASHSHOPRECV_H
diff --git a/src/net/eathena/familyhandler.h b/src/net/eathena/familyhandler.h
index 0865dcdf9..ca3790126 100644
--- a/src/net/eathena/familyhandler.h
+++ b/src/net/eathena/familyhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_FAMILYHANDLER_H
 #define NET_EATHENA_FAMILYHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/familyhandler.h"
 
 namespace EAthena
@@ -41,5 +39,4 @@ class FamilyHandler final : public Net::FamilyHandler
 
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_FAMILYHANDLER_H
diff --git a/src/net/eathena/familyrecv.h b/src/net/eathena/familyrecv.h
index 0ce18bf7f..51f4c10ec 100644
--- a/src/net/eathena/familyrecv.h
+++ b/src/net/eathena/familyrecv.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_FAMILYRECV_H
 #define NET_EATHENA_FAMILYRECV_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "enums/simpletypes/beingid.h"
 
 namespace Net
@@ -44,5 +42,4 @@ namespace EAthena
     }  // namespace FamilyRecv
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_FAMILYRECV_H
diff --git a/src/net/eathena/friendshandler.h b/src/net/eathena/friendshandler.h
index ac1e8f3d1..1f2804f03 100644
--- a/src/net/eathena/friendshandler.h
+++ b/src/net/eathena/friendshandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_FRIENDSHANDLER_H
 #define NET_EATHENA_FRIENDSHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/friendshandler.h"
 
 namespace EAthena
@@ -46,5 +44,4 @@ class FriendsHandler final : public Net::FriendsHandler
 
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_FRIENDSHANDLER_H
diff --git a/src/net/eathena/friendsrecv.h b/src/net/eathena/friendsrecv.h
index e1bb04da7..0aa03f1da 100644
--- a/src/net/eathena/friendsrecv.h
+++ b/src/net/eathena/friendsrecv.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_FRIENDSRECV_H
 #define NET_EATHENA_FRIENDSRECV_H
 
-#ifdef EATHENA_SUPPORT
-
 namespace Net
 {
     class MessageIn;
@@ -40,5 +38,4 @@ namespace EAthena
     }  // namespace FriendsRecv
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_FRIENDSRECV_H
diff --git a/src/net/eathena/homunculushandler.h b/src/net/eathena/homunculushandler.h
index e1262f6e9..1ecfda4e2 100644
--- a/src/net/eathena/homunculushandler.h
+++ b/src/net/eathena/homunculushandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_HOMUNCULUSHANDLER_H
 #define NET_EATHENA_HOMUNCULUSHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/homunculushandler.h"
 
 namespace EAthena
@@ -56,5 +54,4 @@ class HomunculusHandler final : public Net::HomunculusHandler
 
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_HOMUNCULUSHANDLER_H
diff --git a/src/net/eathena/homunculusrecv.h b/src/net/eathena/homunculusrecv.h
index 76ddcf544..5184d0b6c 100644
--- a/src/net/eathena/homunculusrecv.h
+++ b/src/net/eathena/homunculusrecv.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_HOMUNCULUSRECV_H
 #define NET_EATHENA_HOMUNCULUSRECV_H
 
-#ifdef EATHENA_SUPPORT
-
 namespace Net
 {
     class MessageIn;
@@ -41,5 +39,4 @@ namespace EAthena
     }  // namespace HomunculusRecv
 }  // namespace EAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_EATHENA_HOMUNCULUSRECV_H
diff --git a/src/net/elementalhandler.h b/src/net/elementalhandler.h
index 93558830d..a07b9285e 100644
--- a/src/net/elementalhandler.h
+++ b/src/net/elementalhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_ELEMENTALHANDLER_H
 #define NET_ELEMENTALHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "localconsts.h"
 
 namespace Net
@@ -39,5 +37,4 @@ class ElementalHandler notfinal
 
 extern Net::ElementalHandler *elementalHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_ELEMENTALHANDLER_H
diff --git a/src/net/familyhandler.h b/src/net/familyhandler.h
index 32ef030b4..5297e4385 100644
--- a/src/net/familyhandler.h
+++ b/src/net/familyhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_FAMILYHANDLER_H
 #define NET_FAMILYHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "localconsts.h"
 
 class Being;
@@ -45,5 +43,4 @@ class FamilyHandler notfinal
 
 extern Net::FamilyHandler *familyHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_FAMILYHANDLER_H
diff --git a/src/net/friendshandler.h b/src/net/friendshandler.h
index 9ae9e6e9e..af3709aae 100644
--- a/src/net/friendshandler.h
+++ b/src/net/friendshandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_FRIENDSHANDLER_H
 #define NET_FRIENDSHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include <string>
 
 #include "localconsts.h"
@@ -49,5 +47,4 @@ class FriendsHandler notfinal
 
 extern Net::FriendsHandler *friendsHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_FRIENDSHANDLER_H
diff --git a/src/net/homunculushandler.h b/src/net/homunculushandler.h
index 8f3c7dab9..f5e5b1347 100644
--- a/src/net/homunculushandler.h
+++ b/src/net/homunculushandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_HOMUNCULUSHANDLER_H
 #define NET_HOMUNCULUSHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "enums/simpletypes/beingid.h"
 #include "enums/simpletypes/keep.h"
 
@@ -63,5 +61,4 @@ class HomunculusHandler notfinal
 
 extern Net::HomunculusHandler *homunculusHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_HOMUNCULUSHANDLER_H
diff --git a/src/net/mailhandler.h b/src/net/mailhandler.h
index f14e8f00d..95dbdfa8b 100644
--- a/src/net/mailhandler.h
+++ b/src/net/mailhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_MAILHANDLER_H
 #define NET_MAILHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include <string>
 
 #include "localconsts.h"
@@ -61,5 +59,4 @@ class MailHandler notfinal
 
 extern Net::MailHandler *mailHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_MAILHANDLER_H
diff --git a/src/net/maphandler.h b/src/net/maphandler.h
index 61d47bf82..d59c4bc37 100644
--- a/src/net/maphandler.h
+++ b/src/net/maphandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_MAPHANDLER_H
 #define NET_MAPHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "localconsts.h"
 
 namespace Net
@@ -39,5 +37,4 @@ class MapHandler notfinal
 
 extern Net::MapHandler *mapHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_MAPHANDLER_H
diff --git a/src/net/markethandler.h b/src/net/markethandler.h
index 4ebbb6e61..433a586e4 100644
--- a/src/net/markethandler.h
+++ b/src/net/markethandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_MARKETHANDLER_H
 #define NET_MARKETHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "enums/resources/itemtype.h"
 
 #include "enums/simpletypes/itemcolor.h"
@@ -56,5 +54,4 @@ class MarketHandler notfinal
 
 extern Net::MarketHandler *marketHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_MARKETHANDLER_H
diff --git a/src/net/mercenaryhandler.h b/src/net/mercenaryhandler.h
index 83ec9c94b..f194d9d96 100644
--- a/src/net/mercenaryhandler.h
+++ b/src/net/mercenaryhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_MERCENARYHANDLER_H
 #define NET_MERCENARYHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "enums/simpletypes/beingid.h"
 #include "enums/simpletypes/keep.h"
 
@@ -59,5 +57,4 @@ class MercenaryHandler notfinal
 
 extern Net::MercenaryHandler *mercenaryHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_MERCENARYHANDLER_H
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:
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index 529765bb0..7ee51dcf2 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -92,10 +92,8 @@ class NpcHandler notfinal
                                 const int materialId2,
                                 const int materialId3) const  = 0;
 
-#ifdef EATHENA_SUPPORT
         virtual void cooking(const CookingTypeT type,
                              const int nameId) const = 0;
-#endif
 
         virtual void repair(const int index) const = 0;
 
diff --git a/src/net/roulettehandler.h b/src/net/roulettehandler.h
index 66bda0b1d..29987fec0 100644
--- a/src/net/roulettehandler.h
+++ b/src/net/roulettehandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_ROULETTEHANDLER_H
 #define NET_ROULETTEHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "localconsts.h"
 
 namespace Net
@@ -39,5 +37,4 @@ class RouletteHandler notfinal
 
 extern Net::RouletteHandler *rouletteHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_ROULETTEHANDLER_H
diff --git a/src/net/searchstorehandler.h b/src/net/searchstorehandler.h
index 1b903793d..b46640348 100644
--- a/src/net/searchstorehandler.h
+++ b/src/net/searchstorehandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_SEARCHSTOREHANDLER_H
 #define NET_SEARCHSTOREHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "enums/net/storesearchtype.h"
 
 #include "localconsts.h"
@@ -54,5 +52,4 @@ class SearchStoreHandler notfinal
 
 extern Net::SearchStoreHandler *searchStoreHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_SEARCHSTOREHANDLER_H
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index 37be5e279..1e87f88f8 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -168,18 +168,14 @@ class ServerInfo final
 #ifdef TMWA_SUPPORT
             if (compareStrI(serverType, "tmwathena") == 0)
                 return ServerType::TMWATHENA;
-#endif  // TMWA_SUPPORT
-#if defined(TMWA_SUPPORT) && defined(EATHENA_SUPPORT)
             else
-#endif  // defined(TMWA_SUPPORT) && defined(EATHENA_SUPPORT)
-#ifdef EATHENA_SUPPORT
+#endif  // TMWA_SUPPORT
             if (compareStrI(serverType, "eathena") == 0)
                 return ServerType::EATHENA;
             else if (compareStrI(serverType, "hercules") == 0)
                 return ServerType::EATHENA;
             else if (compareStrI(serverType, "evol2") == 0)
                 return ServerType::EVOL2;
-#endif  // EATHENA_SUPPORT
             return ServerType::UNKNOWN;
         }
 };
diff --git a/src/net/tmwa/auctionhandler.h b/src/net/tmwa/auctionhandler.h
index bc86c76ac..254ceaa2b 100644
--- a/src/net/tmwa/auctionhandler.h
+++ b/src/net/tmwa/auctionhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_AUCTIONHANDLER_H
 #define NET_TMWA_AUCTIONHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/auctionhandler.h"
 
 namespace TmwAthena
@@ -62,5 +60,4 @@ class AuctionHandler final : public Net::AuctionHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_AUCTIONHANDLER_H
diff --git a/src/net/tmwa/bankhandler.h b/src/net/tmwa/bankhandler.h
index c71371dbe..b5c0edf29 100644
--- a/src/net/tmwa/bankhandler.h
+++ b/src/net/tmwa/bankhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_BANKHANDLER_H
 #define NET_TMWA_BANKHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/bankhandler.h"
 
 namespace TmwAthena
@@ -48,5 +46,4 @@ class BankHandler final : public Net::BankHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_BANKHANDLER_H
diff --git a/src/net/tmwa/battlegroundhandler.h b/src/net/tmwa/battlegroundhandler.h
index 234b310a9..a56909c7d 100644
--- a/src/net/tmwa/battlegroundhandler.h
+++ b/src/net/tmwa/battlegroundhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_BATTLEGROUNDHANDLER_H
 #define NET_TMWA_BATTLEGROUNDHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/battlegroundhandler.h"
 
 namespace TmwAthena
@@ -51,5 +49,4 @@ class BattleGroundHandler final : public Net::BattleGroundHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_BATTLEGROUNDHANDLER_H
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 3629cf8a7..b89cb22c9 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -56,7 +56,6 @@ void BeingHandler::undress(Being *const being) const
     being->unSetSprite(SPRITE_SHOES);
 }
 
-#ifdef EATHENA_SUPPORT
 void BeingHandler::requestRanks(const RankT rank A_UNUSED) const
 {
 }
@@ -64,7 +63,6 @@ void BeingHandler::requestRanks(const RankT rank A_UNUSED) const
 void BeingHandler::viewPlayerEquipment(const Being *const being A_UNUSED) const
 {
 }
-#endif
 
 void BeingHandler::requestNameByCharId(const int id A_UNUSED) const
 {
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index 4f3e70fb1..4c6df6f7b 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -39,13 +39,11 @@ class BeingHandler final : public Ea::BeingHandler
 
         void undress(Being *const being) const override final;
 
-#ifdef EATHENA_SUPPORT
         void requestRanks(const RankT rank A_UNUSED) const override final
                           A_CONST;
 
         void viewPlayerEquipment(const Being *const being) const override final
                                  A_CONST;
-#endif
 
         void requestNameByCharId(const int id) const override final A_CONST;
 };
diff --git a/src/net/tmwa/buyingstorehandler.h b/src/net/tmwa/buyingstorehandler.h
index b9816310a..4658d9e79 100644
--- a/src/net/tmwa/buyingstorehandler.h
+++ b/src/net/tmwa/buyingstorehandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_BUYINGSTOREHANDLER_H
 #define NET_TMWA_BUYINGSTOREHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/buyingstorehandler.h"
 
 namespace TmwAthena
@@ -53,5 +51,4 @@ class BuyingStoreHandler final : public Net::BuyingStoreHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_BUYINGSTOREHANDLER_H
diff --git a/src/net/tmwa/cashshophandler.h b/src/net/tmwa/cashshophandler.h
index 6c622270d..2fabdfc02 100644
--- a/src/net/tmwa/cashshophandler.h
+++ b/src/net/tmwa/cashshophandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_CASHSHOPHANDLER_H
 #define NET_TMWA_CASHSHOPHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/cashshophandler.h"
 
 namespace TmwAthena
@@ -54,5 +52,4 @@ class CashShopHandler final : public Net::CashShopHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_CASHSHOPHANDLER_H
diff --git a/src/net/tmwa/elementalhandler.h b/src/net/tmwa/elementalhandler.h
index b2ed06640..9eac1f937 100644
--- a/src/net/tmwa/elementalhandler.h
+++ b/src/net/tmwa/elementalhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_ELEMENTALHANDLER_H
 #define NET_TMWA_ELEMENTALHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/elementalhandler.h"
 
 namespace TmwAthena
@@ -36,5 +34,4 @@ namespace TmwAthena
     };
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_ELEMENTALHANDLER_H
diff --git a/src/net/tmwa/familyhandler.h b/src/net/tmwa/familyhandler.h
index c01df9e4f..53d7f8073 100644
--- a/src/net/tmwa/familyhandler.h
+++ b/src/net/tmwa/familyhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_FAMILYHANDLER_H
 #define NET_TMWA_FAMILYHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/familyhandler.h"
 
 namespace TmwAthena
@@ -43,5 +41,4 @@ class FamilyHandler final : public Net::FamilyHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_FAMILYHANDLER_H
diff --git a/src/net/tmwa/friendshandler.h b/src/net/tmwa/friendshandler.h
index 6eb739d4d..94d1aa2c0 100644
--- a/src/net/tmwa/friendshandler.h
+++ b/src/net/tmwa/friendshandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_FRIENDSHANDLER_H
 #define NET_TMWA_FRIENDSHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/friendshandler.h"
 
 namespace TmwAthena
@@ -46,5 +44,4 @@ class FriendsHandler final : public Net::FriendsHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_FRIENDSHANDLER_H
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 831e2bd7e..71030d748 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -51,7 +51,6 @@
 #include "net/tmwa/skillhandler.h"
 #include "net/tmwa/questhandler.h"
 
-#ifdef EATHENA_SUPPORT
 #include "net/tmwa/auctionhandler.h"
 #include "net/tmwa/bankhandler.h"
 #include "net/tmwa/battlegroundhandler.h"
@@ -68,7 +67,6 @@
 #include "net/tmwa/roulettehandler.h"
 #include "net/tmwa/searchstorehandler.h"
 #include "net/tmwa/vendinghandler.h"
-#endif
 
 #include "utils/delete2.h"
 #include "utils/gettext.h"
@@ -98,7 +96,6 @@ GeneralHandler::GeneralHandler() :
     mSkillHandler(new SkillHandler),
     mTradeHandler(new TradeHandler),
     mQuestHandler(new QuestHandler),
-#ifdef EATHENA_SUPPORT
     mServerFeatures(new ServerFeatures),
     mAuctionHandler(new AuctionHandler),
     mBankHandler(new BankHandler),
@@ -116,9 +113,6 @@ GeneralHandler::GeneralHandler() :
     mRouletteHandler(new RouletteHandler),
     mSearchStoreHandler(new SearchStoreHandler),
     mVendingHandler(new VendingHandler)
-#else
-    mServerFeatures(new ServerFeatures)
-#endif
 {
     generalHandler = this;
 }
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 18273d093..02df75861 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -45,7 +45,6 @@ class SkillHandler;
 class TradeHandler;
 class QuestHandler;
 class ServerFeatures;
-#ifdef EATHENA_SUPPORT
 class AuctionHandler;
 class BankHandler;
 class BattleGroundHandler;
@@ -62,7 +61,6 @@ class MercenaryHandler;
 class RouletteHandler;
 class SearchStoreHandler;
 class VendingHandler;
-#endif
 
 class GeneralHandler final : public Net::GeneralHandler
 {
@@ -110,7 +108,6 @@ class GeneralHandler final : public Net::GeneralHandler
         TradeHandler *mTradeHandler;
         QuestHandler *mQuestHandler;
         ServerFeatures *mServerFeatures;
-#ifdef EATHENA_SUPPORT
         AuctionHandler *mAuctionHandler;
         BankHandler *mBankHandler;
         BattleGroundHandler *mBattleGroundHandler;
@@ -127,7 +124,6 @@ class GeneralHandler final : public Net::GeneralHandler
         RouletteHandler *mRouletteHandler;
         SearchStoreHandler *mSearchStoreHandler;
         VendingHandler *mVendingHandler;
-#endif
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/homunculushandler.h b/src/net/tmwa/homunculushandler.h
index 04999440a..557459627 100644
--- a/src/net/tmwa/homunculushandler.h
+++ b/src/net/tmwa/homunculushandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_HOMUNCULUSHANDLER_H
 #define NET_TMWA_HOMUNCULUSHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/homunculushandler.h"
 
 namespace TmwAthena
@@ -59,5 +57,4 @@ class HomunculusHandler final : public Net::HomunculusHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_HOMUNCULUSHANDLER_H
diff --git a/src/net/tmwa/mailhandler.h b/src/net/tmwa/mailhandler.h
index 9b12f0731..cf84e6cda 100644
--- a/src/net/tmwa/mailhandler.h
+++ b/src/net/tmwa/mailhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_MAILHANDLER_H
 #define NET_TMWA_MAILHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/mailhandler.h"
 
 namespace TmwAthena
@@ -59,5 +57,4 @@ class MailHandler final : public Net::MailHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_MAILHANDLER_H
diff --git a/src/net/tmwa/maphandler.h b/src/net/tmwa/maphandler.h
index db2c9bb37..726445189 100644
--- a/src/net/tmwa/maphandler.h
+++ b/src/net/tmwa/maphandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_MAPHANDLER_H
 #define NET_TMWA_MAPHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/maphandler.h"
 
 namespace TmwAthena
@@ -38,5 +36,4 @@ class MapHandler final : public Net::MapHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_MAPHANDLER_H
diff --git a/src/net/tmwa/markethandler.h b/src/net/tmwa/markethandler.h
index a9dac7519..68882ac57 100644
--- a/src/net/tmwa/markethandler.h
+++ b/src/net/tmwa/markethandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_MARKETHANDLER_H
 #define NET_TMWA_MARKETHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/markethandler.h"
 
 namespace TmwAthena
@@ -47,5 +45,4 @@ class MarketHandler final : public Net::MarketHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_MARKETHANDLER_H
diff --git a/src/net/tmwa/mercenaryhandler.h b/src/net/tmwa/mercenaryhandler.h
index 760bdf8ac..ee7896eb5 100644
--- a/src/net/tmwa/mercenaryhandler.h
+++ b/src/net/tmwa/mercenaryhandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_MERCENARYHANDLER_H
 #define NET_TMWA_MERCENARYHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/mercenaryhandler.h"
 
 namespace TmwAthena
@@ -55,5 +53,4 @@ class MercenaryHandler final : public Net::MercenaryHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_MERCENARYHANDLER_H
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index ba1c8f7a3..4a02b32b4 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -161,12 +161,10 @@ void NpcHandler::produceMix(const int nameId A_UNUSED,
 {
 }
 
-#ifdef EATHENA_SUPPORT
 void NpcHandler::cooking(const CookingTypeT type A_UNUSED,
                          const int nameId A_UNUSED) const
 {
 }
-#endif
 
 void NpcHandler::repair(const int index A_UNUSED) const
 {
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index b6483772d..f6ebff763 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -79,10 +79,8 @@ class NpcHandler final : public Ea::NpcHandler
                         const int materialId2,
                         const int materialId3) const override final A_CONST;
 
-#ifdef EATHENA_SUPPORT
         void cooking(const CookingTypeT type,
                      const int nameId) const override final A_CONST;
-#endif
 
         void repair(const int index) const override final A_CONST;
 
diff --git a/src/net/tmwa/roulettehandler.h b/src/net/tmwa/roulettehandler.h
index ae68a4208..592cce98c 100644
--- a/src/net/tmwa/roulettehandler.h
+++ b/src/net/tmwa/roulettehandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_ROULETTEHANDLER_H
 #define NET_TMWA_ROULETTEHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/roulettehandler.h"
 
 namespace TmwAthena
@@ -37,5 +35,4 @@ class RouletteHandler final : public Net::RouletteHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_ROULETTEHANDLER_H
diff --git a/src/net/tmwa/searchstorehandler.h b/src/net/tmwa/searchstorehandler.h
index a116d266d..3051c98a1 100644
--- a/src/net/tmwa/searchstorehandler.h
+++ b/src/net/tmwa/searchstorehandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_SEARCHSTOREHANDLER_H
 #define NET_TMWA_SEARCHSTOREHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/searchstorehandler.h"
 
 namespace TmwAthena
@@ -50,5 +48,4 @@ class SearchStoreHandler final : public Net::SearchStoreHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_SEARCHSTOREHANDLER_H
diff --git a/src/net/tmwa/vendinghandler.h b/src/net/tmwa/vendinghandler.h
index b06b15263..47a99c7b4 100644
--- a/src/net/tmwa/vendinghandler.h
+++ b/src/net/tmwa/vendinghandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_VENDINGHANDLER_H
 #define NET_TMWA_VENDINGHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include "net/vendinghandler.h"
 
 namespace TmwAthena
@@ -56,5 +54,4 @@ class VendingHandler final : public Net::VendingHandler
 
 }  // namespace TmwAthena
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_VENDINGHANDLER_H
diff --git a/src/net/vendinghandler.h b/src/net/vendinghandler.h
index e313d2ac8..dbabbef7a 100644
--- a/src/net/vendinghandler.h
+++ b/src/net/vendinghandler.h
@@ -21,8 +21,6 @@
 #ifndef NET_VENDINGHANDLER_H
 #define NET_VENDINGHANDLER_H
 
-#ifdef EATHENA_SUPPORT
-
 #include <string>
 #include <vector>
 
@@ -62,5 +60,4 @@ class VendingHandler notfinal
 
 extern Net::VendingHandler *vendingHandler;
 
-#endif  // EATHENA_SUPPORT
 #endif  // NET_VENDINGHANDLER_H