diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-07-30 14:33:28 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-07-30 14:33:28 +0000 |
commit | aff167beefadc32add4b44626cc2f1cbef800c7b (patch) | |
tree | 43796105cc107ec55742e88562e064d8031d3b23 /src/main.cpp | |
parent | 18b73fdadd715d356416a95c31a25b3293fa2596 (diff) | |
download | mana-aff167beefadc32add4b44626cc2f1cbef800c7b.tar.gz mana-aff167beefadc32add4b44626cc2f1cbef800c7b.tar.bz2 mana-aff167beefadc32add4b44626cc2f1cbef800c7b.tar.xz mana-aff167beefadc32add4b44626cc2f1cbef800c7b.zip |
Updated TMW to be compatible with Guichan 0.5.0 (merged from guichan-0.5.0
branch).
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 8cd6eeb6..1bec709f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -100,7 +100,7 @@ Logger *logger; /**< Log object */ namespace { struct ErrorListener : public gcn::ActionListener { - void action(const std::string& eventId) { state = LOGIN_STATE; } + void action(const std::string &eventId, gcn::Widget *widget) { state = LOGIN_STATE; } } errorListener; } @@ -606,7 +606,8 @@ int main(int argc, char *argv[]) oldstate = state; - if (currentDialog && state != ACCOUNT_STATE && state != CHAR_CONNECT_STATE) { + if (currentDialog && state != ACCOUNT_STATE && + state != CHAR_CONNECT_STATE) { delete currentDialog; currentDialog = NULL; } @@ -631,7 +632,8 @@ int main(int argc, char *argv[]) currentDialog = new CharSelectDialog(network, &charInfo, 1 - loginData.sex); if (options.chooseDefault) { - ((CharSelectDialog*)currentDialog)->action("ok"); + ((CharSelectDialog*)currentDialog)->action("ok", + NULL); } break; |