summaryrefslogtreecommitdiff
path: root/src/net/tmwserv/generalhandler.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-10-01 12:48:28 -0600
committerJared Adams <jaxad0127@gmail.com>2009-10-01 12:48:28 -0600
commitda61b7e9cb40e75ad0d74cc64853bf1b08d0a031 (patch)
treea1d5157ac530b42ce4ca2c316fcaa419cc23c01c /src/net/tmwserv/generalhandler.cpp
parent83fd36204202b4b5cca7e6cdb37c025919f32f08 (diff)
downloadMana-da61b7e9cb40e75ad0d74cc64853bf1b08d0a031.tar.gz
Mana-da61b7e9cb40e75ad0d74cc64853bf1b08d0a031.tar.bz2
Mana-da61b7e9cb40e75ad0d74cc64853bf1b08d0a031.tar.xz
Mana-da61b7e9cb40e75ad0d74cc64853bf1b08d0a031.zip
Finish merging registration dialog
Diffstat (limited to 'src/net/tmwserv/generalhandler.cpp')
-rw-r--r--src/net/tmwserv/generalhandler.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/net/tmwserv/generalhandler.cpp b/src/net/tmwserv/generalhandler.cpp
index 81bb46be..68f8c918 100644
--- a/src/net/tmwserv/generalhandler.cpp
+++ b/src/net/tmwserv/generalhandler.cpp
@@ -21,6 +21,7 @@
#include "net/tmwserv/generalhandler.h"
+#include "gui/changeemaildialog.h"
#include "gui/inventorywindow.h"
#include "gui/partywindow.h"
#include "gui/register.h"
@@ -61,6 +62,7 @@ Net::Connection *accountServerConnection = 0;
namespace TmwServ {
+std::string userEmail = "";
std::string netToken = "";
ServerInfo gameServer;
ServerInfo chatServer;
@@ -155,8 +157,10 @@ void GeneralHandler::tick()
void GeneralHandler::guiWindowsLoaded()
{
+ ChangeEmailDialog::setEmail(*userEmail);
inventoryWindow->setSplitAllowed(true);
partyWindow->clearPartyName();
+ RegisterDialog::setEmail(&userEmail);
RegisterDialog::setGender(NULL);
skillDialog->loadSkills("tmw-skills.xml");
specialsWindow->loadSpecials("specials.xml");