Remove two unneeded methods of Net::GeneralHandler

6 files changed, 0 insertions, 35 deletions

diff --git a/src/main.cpp b/src/main.cpp
index fc88a1d9..16a5cb1c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -851,7 +851,6 @@ int main(int argc, char *argv[])
         if (Net::getGeneralHandler())
         {
             Net::getGeneralHandler()->flushNetwork();
-            Net::getGeneralHandler()->tick();
         }
         gui->logic();
 
diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp
index 4ef2f9e2..dc022557 100644
--- a/src/net/ea/generalhandler.cpp
+++ b/src/net/ea/generalhandler.cpp
@@ -191,17 +191,6 @@ void GeneralHandler::flushNetwork()
 
     mNetwork->flush();
     mNetwork->dispatchMessages();
-}
-
-bool GeneralHandler::isNetworkConnected()
-{
-    return mNetwork->isConnected();
-}
-
-void GeneralHandler::tick()
-{
-    if (!mNetwork)
-        return;
 
     if (mNetwork->getState() == Network::NET_ERROR)
     {
diff --git a/src/net/ea/generalhandler.h b/src/net/ea/generalhandler.h
index 8bbf4f61..abedd2f4 100644
--- a/src/net/ea/generalhandler.h
+++ b/src/net/ea/generalhandler.h
@@ -47,10 +47,6 @@ class GeneralHandler : public MessageHandler, public Net::GeneralHandler
 
         void flushNetwork();
 
-        bool isNetworkConnected();
-
-        void tick();
-
         void guiWindowsLoaded();
 
         void guiWindowsUnloaded();
diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h
index 0a22d0fd..1da1fddf 100644
--- a/src/net/generalhandler.h
+++ b/src/net/generalhandler.h
@@ -37,10 +37,6 @@ class GeneralHandler
 
         virtual void flushNetwork() = 0;
 
-        virtual bool isNetworkConnected() = 0;
-
-        virtual void tick() = 0;
-
         virtual void guiWindowsLoaded() = 0;
 
         virtual void guiWindowsUnloaded() = 0;
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index 66929ef6..bd8e42ee 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -157,17 +157,6 @@ void GeneralHandler::flushNetwork()
     }
 }
 
-bool GeneralHandler::isNetworkConnected()
-{
-    // TODO
-    return true;
-}
-
-void GeneralHandler::tick()
-{
-    // TODO
-}
-
 void GeneralHandler::guiWindowsLoaded()
 {
     inventoryWindow->setSplitAllowed(true);
diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h
index a1010d32..92ff5909 100644
--- a/src/net/manaserv/generalhandler.h
+++ b/src/net/manaserv/generalhandler.h
@@ -42,10 +42,6 @@ class GeneralHandler : public Net::GeneralHandler
 
         void flushNetwork();
 
-        bool isNetworkConnected();
-
-        void tick();
-
         void guiWindowsLoaded();
 
         void guiWindowsUnloaded();