Unify eAthena and manaserv support in to one build.

Finish support for server types in the server dialog.
Using the new server type function, strip out ifdefs, replacing them with if
blocks for later merging in smaller atomic commits.
Remove any remaining references to the support defs, including in build system.

1 files changed, 24 insertions, 0 deletions

diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index d82e2613..f0d99b30 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -42,6 +42,7 @@ class Label;
 class ListBox;
 class ServerDialog;
 class TextField;
+class DropDown;
 
 /**
  * Server and Port List Model
@@ -73,6 +74,26 @@ class ServersListModel : public gcn::ListModel
 };
 
 /**
+ * Server and Port List Model
+ */
+class TypeListModel : public gcn::ListModel
+{
+    public:
+        TypeListModel() { };
+
+        /**
+         * Used to get number of line in the list
+         */
+        int getNumberOfElements() { return 2; }
+
+        /**
+         * Used to get an element from the list
+         */
+        std::string getElementAt(int elementIndex);
+};
+
+
+/**
  * The server choice dialog.
  *
  * \ingroup Interface
@@ -134,6 +155,9 @@ class ServerDialog : public Window,
         ListBox *mServersList;
         ServersListModel *mServersListModel;
 
+        DropDown *mTypeField;
+        TypeListModel *mTypeListModel;
+
         const std::string &mDir;
 
         enum ServerDialogDownloadStatus