summaryrefslogtreecommitdiff
path: root/src/gui/charselectdialog.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-03-27 19:05:24 +0300
committerAndrei Karas <akaras@inbox.ru>2013-03-27 21:01:39 +0300
commit8150191686759b13a239c25970924c3c186140ff (patch)
tree6004551128df40dcf178ca639fe42490f80d2c01 /src/gui/charselectdialog.cpp
parent18d8872333e2e433ce7b9e7be71706de37933097 (diff)
downloadmanaplus-8150191686759b13a239c25970924c3c186140ff.tar.gz
manaplus-8150191686759b13a239c25970924c3c186140ff.tar.bz2
manaplus-8150191686759b13a239c25970924c3c186140ff.tar.xz
manaplus-8150191686759b13a239c25970924c3c186140ff.zip
improve charserverhandler class.
Diffstat (limited to 'src/gui/charselectdialog.cpp')
-rw-r--r--src/gui/charselectdialog.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index bc2c42dc7..712870ad8 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -244,7 +244,7 @@ CharSelectDialog::CharSelectDialog(LoginData *const data):
mChangeEmailButton(nullptr),
mCharacterScroller(nullptr),
mCharacterEntries(0),
- mCharHandler(Net::getCharHandler()),
+ mCharServerHandler(Net::getCharServerHandler()),
mDeleteDialog(nullptr),
mDeleteIndex(-1),
mSmallScreen(mainGraphics->getWidth() < 485
@@ -313,7 +313,7 @@ CharSelectDialog::CharSelectDialog(LoginData *const data):
center();
setVisible(true);
- Net::getCharHandler()->setCharSelectDialog(this);
+ Net::getCharServerHandler()->setCharSelectDialog(this);
focusCharacter(0);
}
@@ -350,7 +350,7 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
if (eventId == "use" && mCharacterEntries[selected]->getCharacter())
{
attemptCharacterSelect(selected);
-// Net::getCharHandler()->clear();
+// Net::getCharServerHandler()->clear();
return;
}
else if (eventId == "new" &&
@@ -359,7 +359,7 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
// Start new character dialog
CharCreateDialog *const charCreateDialog =
new CharCreateDialog(this, selected);
- mCharHandler->setCharCreateDialog(charCreateDialog);
+ mCharServerHandler->setCharCreateDialog(charCreateDialog);
return;
}
else if (eventId == "delete"
@@ -371,7 +371,7 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
}
if (eventId == "switch")
{
- Net::getCharHandler()->clear();
+ Net::getCharServerHandler()->clear();
close();
}
else if (eventId == "change_password")
@@ -384,7 +384,7 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
}
else if (eventId == "unregister")
{
- Net::getCharHandler()->clear();
+ Net::getCharServerHandler()->clear();
Client::setState(STATE_UNREGISTER);
}
else if (eventId == "try delete character")
@@ -558,7 +558,7 @@ void CharSelectDialog::attemptCharacterDelete(const int index)
if (mLocked)
return;
- mCharHandler->deleteCharacter(mCharacterEntries[index]->getCharacter());
+ mCharServerHandler->deleteCharacter(mCharacterEntries[index]->getCharacter());
lock();
}
@@ -581,9 +581,9 @@ void CharSelectDialog::attemptCharacterSelect(const int index)
return;
setVisible(false);
- if (mCharHandler && mCharacterEntries[index])
+ if (mCharServerHandler && mCharacterEntries[index])
{
- mCharHandler->chooseCharacter(
+ mCharServerHandler->chooseCharacter(
mCharacterEntries[index]->getCharacter());
}
lock();