Finish merging registration dialog

1 files changed, 11 insertions, 1 deletions

diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index be1cd3de..d4758a8d 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -28,13 +28,13 @@
 #include "gui/changepassworddialog.h"
 #include "net/logindata.h"
 
-#ifdef TMWSERV_SUPPORT
 #include "gui/widgets/radiobutton.h"
 #include "gui/widgets/slider.h"
 
 #include "gui/unregisterdialog.h"
 #include "gui/changeemaildialog.h"
 
+#ifdef TMWSERV_SUPPORT
 #include "net/tmwserv/accountserver/account.h"
 #else
 #include "net/ea/protocol.h"
@@ -92,6 +92,9 @@ void CharDeleteConfirm::action(const gcn::ActionEvent &event)
     ConfirmDialog::action(event);
 }
 
+bool CharSelectDialog::doAllowUnregister = true;
+bool CharSelectDialog::doAllowChangeEmail = true;
+
 CharSelectDialog::CharSelectDialog(LockedArray<LocalPlayer*> *charInfo,
                                    LoginData *loginData):
     Window(_("Account and Character Management")),
@@ -369,3 +372,10 @@ bool CharSelectDialog::selectByName(const std::string &name)
 
     return false;
 }
+
+static void CharSelectDialog::setNetworkOptions(bool allowUnregister,
+                              bool allowChangeEmail)
+{
+    doAllowUnregister = allowUnregister;
+    doAllowChangeEmail = allowChangeEmail;
+}