Remove define EATHENA_SUPPORT from all code.

Now eathena like support enabled always.

22 files changed, 0 insertions, 66 deletions

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