diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-02-21 20:40:07 +0100 |
|---|---|---|
| committer | Chuck Miller <shadowmil@gmail.com> | 2010-02-21 17:05:40 -0500 |
| commit | c8b0d1e56f27c3141895d28b2fc768afffe7bb2d (patch) | |
| tree | 0a03458836badee3e1b0da13a0721c9261e7fa86 /src/gui/connectiondialog.cpp | |
| parent | 204a14c91bbe4436eb3b26bebf30cbe5669bdd1a (diff) | |
| download | mana-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.tar.gz mana-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.tar.bz2 mana-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.tar.xz mana-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.zip | |
Made tick counter and framerate limiter work during login sequence
Much code was moved from main() to the new Client::exec(). This new
event loop now integrates with the Game class, so that the tick counter
and framerate limiter apply universally.
The Client class is also responsible for some things that used to be
global variables.
Mantis-issue: ...
Diffstat (limited to 'src/gui/connectiondialog.cpp')
| -rw-r--r-- | src/gui/connectiondialog.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/connectiondialog.cpp b/src/gui/connectiondialog.cpp index 7d474247..0ef14d5a 100644 --- a/src/gui/connectiondialog.cpp +++ b/src/gui/connectiondialog.cpp @@ -21,7 +21,6 @@ #include "connectiondialog.h" -#include "main.h" #include "log.h" #include "gui/widgets/button.h" @@ -56,7 +55,7 @@ ConnectionDialog::ConnectionDialog(const std::string &text, void ConnectionDialog::action(const gcn::ActionEvent &) { logger->log("Cancel pressed"); - state = mCancelState; + Client::setState(mCancelState); } void ConnectionDialog::draw(gcn::Graphics *graphics) |