Merge login state machines for both clients

Also do some cleanup and refactoring of related code.

1 files changed, 38 insertions, 0 deletions

diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h
new file mode 100644
index 00000000..045c64c2
--- /dev/null
+++ b/src/net/worldinfo.h
@@ -0,0 +1,38 @@
+/*
+ *  The Mana World
+ *  Copyright (C) 2009  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 WORLD_INFO_H
+#define WORLD_INFO_H
+
+#include <string>
+#include <vector>
+
+typedef struct {
+    int address;
+    std::string name;
+    short port;
+    short online_users;
+    std::string updateHost;
+} WorldInfo;
+
+typedef std::vector<WorldInfo*> Worlds;
+
+#endif // WORLD_INFO_H