Merge login state machines for both clients

Also do some cleanup and refactoring of related code.

1 files changed, 60 insertions, 0 deletions

diff --git a/src/net/tmwserv/gamehandler.h b/src/net/tmwserv/gamehandler.h
new file mode 100644
index 00000000..4721d634
--- /dev/null
+++ b/src/net/tmwserv/gamehandler.h
@@ -0,0 +1,60 @@
+/*
+ *  The Mana World
+ *  Copyright (C) 2004  The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef NET_TMWSERV_MAPHANDLER_H
+#define NET_TMWSERV_MAPHANDLER_H
+
+#include "net/gamehandler.h"
+#include "net/messagehandler.h"
+
+#include "net/serverinfo.h"
+
+namespace TmwServ {
+
+class GameHandler : public MessageHandler, public Net::GameHandler
+{
+    public:
+        GameHandler();
+
+        void handleMessage(MessageIn &msg);
+
+        void connect();
+
+        bool isConnected();
+
+        void disconnect();
+
+        void inGame();
+
+        void mapLoaded(const std::string &mapName);
+
+        void who();
+
+        void quit();
+
+        void ping(int tick);
+
+        void clear();
+};
+
+} // namespace TmwServ
+
+#endif