diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-10-01 19:09:25 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-10-01 19:10:06 -0600 |
commit | 50ff91186126a0e9cc7e216552c349d60d31f451 (patch) | |
tree | 918e10a585bf5685f76720f41844bba8fef4e67d /src/net | |
parent | d974f23b42ddeca3c9cf0d8489dc38d8524c5f12 (diff) | |
download | mana-50ff91186126a0e9cc7e216552c349d60d31f451.tar.gz mana-50ff91186126a0e9cc7e216552c349d60d31f451.tar.bz2 mana-50ff91186126a0e9cc7e216552c349d60d31f451.tar.xz mana-50ff91186126a0e9cc7e216552c349d60d31f451.zip |
Redesign CharSelectDialog
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/ea/generalhandler.cpp | 7 | ||||
-rw-r--r-- | src/net/tmwserv/generalhandler.cpp | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp index fac3dcd1..46a115ff 100644 --- a/src/net/ea/generalhandler.cpp +++ b/src/net/ea/generalhandler.cpp @@ -21,6 +21,7 @@ #include "net/ea/generalhandler.h" +#include "gui/charselectdialog.h" #include "gui/inventorywindow.h" #include "gui/register.h" #include "gui/skilldialog.h" @@ -101,6 +102,10 @@ GeneralHandler::GeneralHandler(): stats.push_back(ItemDB::Stat("luck", N_("Luck %+d"))); ItemDB::setStatsList(stats); + + CharSelectDialog::setNetworkOptions(false, false); + RegisterDialog::setEmail(NULL); + RegisterDialog::setGender(&netToken.sex); } GeneralHandler::~GeneralHandler() @@ -207,8 +212,6 @@ void GeneralHandler::guiWindowsLoaded() { partyTab = new PartyTab; inventoryWindow->setSplitAllowed(false); - RegisterDialog::setEmail(NULL); - RegisterDialog::setGender(&netToken.sex); skillDialog->loadSkills("ea-skills.xml"); statusWindow->addAttribute(STR, _("Strength"), true); diff --git a/src/net/tmwserv/generalhandler.cpp b/src/net/tmwserv/generalhandler.cpp index 3102f746..ede20ff0 100644 --- a/src/net/tmwserv/generalhandler.cpp +++ b/src/net/tmwserv/generalhandler.cpp @@ -22,6 +22,7 @@ #include "net/tmwserv/generalhandler.h" #include "gui/changeemaildialog.h" +#include "gui/charselectdialog.h" #include "gui/inventorywindow.h" #include "gui/partywindow.h" #include "gui/register.h" @@ -101,6 +102,11 @@ GeneralHandler::GeneralHandler(): stats.push_back(ItemDB::Stat("will", N_("Willpower %+d"))); ItemDB::setStatsList(stats); + + ChangeEmailDialog::setEmail(&userEmail); + CharSelectDialog::setNetworkOptions(true, true); + RegisterDialog::setEmail(&userEmail); + RegisterDialog::setGender(NULL); } void GeneralHandler::load() @@ -157,11 +163,8 @@ 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"); |