From be3c1cf049d3df146d18acfb7cbead2ef3f660f1 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 28 Mar 2013 23:21:07 +0300
Subject: improve generalhandler class.

---
 src/net/eathena/generalhandler.h | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'src/net/eathena/generalhandler.h')

diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h
index 184f30bdc..d2fba855d 100644
--- a/src/net/eathena/generalhandler.h
+++ b/src/net/eathena/generalhandler.h
@@ -34,8 +34,7 @@ namespace EAthena
 {
 
 class GeneralHandler final : public MessageHandler,
-                             public Net::GeneralHandler,
-                             public Listener
+                             public Net::GeneralHandler
 {
     public:
         GeneralHandler();
@@ -44,24 +43,23 @@ class GeneralHandler final : public MessageHandler,
 
         ~GeneralHandler();
 
-        void handleMessage(Net::MessageIn &msg);
+        void handleMessage(Net::MessageIn &msg) override;
 
-        void load();
+        void load() override;
 
-        void reload();
+        void reload() override;
 
-        void unload();
+        void unload() override;
 
-        void flushNetwork();
+        void flushNetwork() override;
 
-        void clearHandlers();
+        void clearHandlers() override;
 
-        void processEvent(Channels channel,
-                          const DepricatedEvent &event) override;
+        void reloadPartially() override;
 
-        void reloadPartially();
+        void gameStarted() const override;
 
-        void requestOnlineList();
+        void gameEnded() const override;
 
     protected:
         MessageHandlerPtr mAdminHandler;
-- 
cgit v1.2.3-60-g2f50