Got rid of GameHandler::clear

It was just forwarding to disconnect().

4 files changed, 3 insertions, 15 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 9c4aadac..865588ff 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -934,7 +934,7 @@ int main(int argc, char *argv[])
 
         if (state == STATE_SWITCH_LOGIN && oldstate == STATE_GAME)
         {
-            Net::getGameHandler()->clear();
+            Net::getGameHandler()->disconnect();
         }
 
         if (state != oldstate)
@@ -1268,7 +1268,7 @@ int main(int argc, char *argv[])
                     logger->log("State: SWITCH CHARACTER");
 
                     // Done with game
-                    Net::getGameHandler()->clear();
+                    Net::getGameHandler()->disconnect();
 
                     Net::getCharHandler()->getCharacters();
                     break;
@@ -1299,7 +1299,7 @@ int main(int argc, char *argv[])
                     currentDialog = new OkDialog(_("Error"), errorMessage);
                     currentDialog->addActionListener(&errorListener);
                     currentDialog = NULL; // OkDialog deletes itself
-                    Net::getGameHandler()->clear();
+                    Net::getGameHandler()->disconnect();
                     break;
 
                 default:
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index f101e03a..597fd1da 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -162,9 +162,4 @@ void GameHandler::ping(int tick)
     msg.writeInt32(tick);
 }
 
-void GameHandler::clear()
-{
-    disconnect();
-}
-
 } // namespace EAthena
diff --git a/src/net/gamehandler.h b/src/net/gamehandler.h
index 062b6770..34a36e61 100644
--- a/src/net/gamehandler.h
+++ b/src/net/gamehandler.h
@@ -46,8 +46,6 @@ class GameHandler
         virtual void quit() = 0;
 
         virtual void ping(int tick) = 0;
-
-        virtual void clear() = 0;
 };
 
 } // namespace Net
diff --git a/src/net/manaserv/gamehandler.cpp b/src/net/manaserv/gamehandler.cpp
index 2a4e08b6..c7f8eeee 100644
--- a/src/net/manaserv/gamehandler.cpp
+++ b/src/net/manaserv/gamehandler.cpp
@@ -124,9 +124,4 @@ void GameHandler::ping(int tick)
     // TODO
 }
 
-void GameHandler::clear()
-{
-    disconnect();
-}
-
 } // namespace ManaServ