1 files changed, 69 insertions, 39 deletions

diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h
index 0a7089c5d..d8f23a4c6 100644
--- a/src/net/eathena/generalhandler.h
+++ b/src/net/eathena/generalhandler.h
@@ -25,15 +25,47 @@
 
 #include "net/generalhandler.h"
 
-#include "net/eathena/messagehandler.h"
-
 namespace EAthena
 {
 
+class AdminHandler;
+class BeingHandler;
+class BuySellHandler;
+class CharServerHandler;
+class ChatHandler;
+class GameHandler;
+class GuildHandler;
+class InventoryHandler;
+class ItemHandler;
+class LoginHandler;
+class NpcHandler;
+class PartyHandler;
+class PetHandler;
+class PlayerHandler;
+class SkillHandler;
+class TradeHandler;
+class QuestHandler;
+class ServerFeatures;
+class AuctionHandler;
+class BankHandler;
+class BattleGroundHandler;
+class BuyingStoreHandler;
+class CashShopHandler;
+class ElementalHandler;
+class FamilyHandler;
+class FriendsHandler;
+class HomunculusHandler;
+class MailHandler;
+class MapHandler;
+class MarketHandler;
+class MercenaryHandler;
+class RouletteHandler;
+class SearchStoreHandler;
+class VendingHandler;
+
 class ServerFeatures;
 
-class GeneralHandler final : public MessageHandler,
-                             public Net::GeneralHandler
+class GeneralHandler final : public Net::GeneralHandler
 {
     public:
         GeneralHandler();
@@ -42,8 +74,6 @@ class GeneralHandler final : public MessageHandler,
 
         ~GeneralHandler();
 
-        void handleMessage(Net::MessageIn &msg) override final;
-
         void load() override final;
 
         void reload() override final;
@@ -63,40 +93,40 @@ class GeneralHandler final : public MessageHandler,
         void gameEnded() const override final;
 
     protected:
-        MessageHandlerPtr mAdminHandler;
-        MessageHandlerPtr mBeingHandler;
-        MessageHandlerPtr mBuySellHandler;
-        MessageHandlerPtr mCharServerHandler;
-        MessageHandlerPtr mChatHandler;
-        MessageHandlerPtr mGameHandler;
-        MessageHandlerPtr mGuildHandler;
-        MessageHandlerPtr mInventoryHandler;
-        MessageHandlerPtr mItemHandler;
-        MessageHandlerPtr mLoginHandler;
-        MessageHandlerPtr mNpcHandler;
-        MessageHandlerPtr mPartyHandler;
-        MessageHandlerPtr mPetHandler;
-        MessageHandlerPtr mPlayerHandler;
-        MessageHandlerPtr mSkillHandler;
-        MessageHandlerPtr mTradeHandler;
-        MessageHandlerPtr mQuestHandler;
+        AdminHandler *mAdminHandler;
+        BeingHandler *mBeingHandler;
+        BuySellHandler *mBuySellHandler;
+        CharServerHandler *mCharServerHandler;
+        ChatHandler *mChatHandler;
+        GameHandler *mGameHandler;
+        GuildHandler *mGuildHandler;
+        InventoryHandler *mInventoryHandler;
+        ItemHandler *mItemHandler;
+        LoginHandler *mLoginHandler;
+        NpcHandler *mNpcHandler;
+        PartyHandler *mPartyHandler;
+        PetHandler *mPetHandler;
+        PlayerHandler *mPlayerHandler;
+        SkillHandler *mSkillHandler;
+        TradeHandler *mTradeHandler;
+        QuestHandler *mQuestHandler;
         ServerFeatures *mServerFeatures;
-        MessageHandlerPtr mMailHandler;
-        MessageHandlerPtr mAuctionHandler;
-        MessageHandlerPtr mCashShopHandler;
-        MessageHandlerPtr mFamilyHandler;
-        MessageHandlerPtr mBankHandler;
-        MessageHandlerPtr mBattleGroundHandler;
-        MessageHandlerPtr mMercenaryHandler;
-        MessageHandlerPtr mBuyingStoreHandler;
-        MessageHandlerPtr mHomunculusHandler;
-        MessageHandlerPtr mFriendsHandler;
-        MessageHandlerPtr mElementalHandler;
-        MessageHandlerPtr mMapHandler;
-        MessageHandlerPtr mMarketHandler;
-        MessageHandlerPtr mVendingHandler;
-        MessageHandlerPtr mRouletteHandler;
-        MessageHandlerPtr mSearchStoreHandler;
+        MailHandler *mMailHandler;
+        AuctionHandler *mAuctionHandler;
+        CashShopHandler *mCashShopHandler;
+        FamilyHandler *mFamilyHandler;
+        BankHandler *mBankHandler;
+        BattleGroundHandler *mBattleGroundHandler;
+        MercenaryHandler *mMercenaryHandler;
+        BuyingStoreHandler *mBuyingStoreHandler;
+        HomunculusHandler *mHomunculusHandler;
+        FriendsHandler *mFriendsHandler;
+        ElementalHandler *mElementalHandler;
+        MapHandler *mMapHandler;
+        MarketHandler *mMarketHandler;
+        VendingHandler *mVendingHandler;
+        RouletteHandler *mRouletteHandler;
+        SearchStoreHandler *mSearchStoreHandler;
 };
 
 }  // namespace EAthena