summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-01-14 16:45:13 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-01-14 16:45:13 +0000
commitd1395845cdc678db2a71326f2e6f20253ed14cac (patch)
tree9a75fe0591fc7bd74f828aa048aa027f59a4ae66 /src/main.cpp
parent6c3a2550813c14290307f2ad91e1d76eea3e6a02 (diff)
downloadmana-client-d1395845cdc678db2a71326f2e6f20253ed14cac.tar.gz
mana-client-d1395845cdc678db2a71326f2e6f20253ed14cac.tar.bz2
mana-client-d1395845cdc678db2a71326f2e6f20253ed14cac.tar.xz
mana-client-d1395845cdc678db2a71326f2e6f20253ed14cac.zip
Merged 0.0 changes from revision 2988 to 3035 to trunk.
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp
index b9eeaeb5..3a448494 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -110,7 +110,8 @@ Net::Connection *chatServerConnection = 0;
namespace {
struct ErrorListener : public gcn::ActionListener
{
- void action(const std::string &eventId, gcn::Widget *widget) {
+ void action(const gcn::ActionEvent &event)
+ {
state = STATE_CHOOSE_SERVER;
}
} errorListener;
@@ -713,15 +714,16 @@ int main(int argc, char *argv[])
logger->log("State: CHAR_SELECT");
currentDialog = new CharSelectDialog(&charInfo);
- if (((CharSelectDialog*)currentDialog)->
+ if (((CharSelectDialog*) currentDialog)->
selectByName(options.playername))
options.chooseDefault = true;
else
- ((CharSelectDialog*)currentDialog)->selectByName(
+ ((CharSelectDialog*) currentDialog)->selectByName(
config.getValue("lastCharacter", ""));
if (options.chooseDefault)
- ((CharSelectDialog*)currentDialog)->action("ok", NULL);
+ ((CharSelectDialog*) currentDialog)->action(
+ gcn::ActionEvent(NULL, "ok"));
break;
case STATE_ERROR: