summaryrefslogtreecommitdiff
path: root/src/gui/serverdialog.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-02-21 20:40:07 +0100
committerChuck Miller <shadowmil@gmail.com>2010-02-21 17:05:40 -0500
commitc8b0d1e56f27c3141895d28b2fc768afffe7bb2d (patch)
tree0a03458836badee3e1b0da13a0721c9261e7fa86 /src/gui/serverdialog.cpp
parent204a14c91bbe4436eb3b26bebf30cbe5669bdd1a (diff)
downloadmana-client-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.tar.gz
mana-client-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.tar.bz2
mana-client-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.tar.xz
mana-client-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/serverdialog.cpp')
-rw-r--r--src/gui/serverdialog.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 091197c5..f439420b 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -21,9 +21,9 @@
#include "gui/serverdialog.h"
+#include "client.h"
#include "configuration.h"
#include "log.h"
-#include "main.h"
#include "gui/okdialog.h"
#include "gui/sdlinput.h"
@@ -149,7 +149,8 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir):
currentServer.hostname = config.getValue(currentConfig, "");
currentConfig = "MostUsedServerPort" + toString(i);
- currentServer.port = (short) config.getValue(currentConfig, DEFAULT_PORT);
+ currentServer.port = (short) config.getValue(currentConfig,
+ DEFAULT_PORT);
currentConfig = "MostUsedServerType" + toString(i);
currentServer.type = stringToServerType(config
@@ -308,13 +309,13 @@ void ServerDialog::action(const gcn::ActionEvent &event)
mServerInfo->hostname = currentServer.hostname;
mServerInfo->port = currentServer.port;
mServerInfo->type = currentServer.type;
- state = STATE_CONNECT_SERVER;
+ Client::setState(STATE_CONNECT_SERVER);
}
}
else if (event.getId() == "quit")
{
mDownload->cancel();
- state = STATE_FORCE_QUIT;
+ Client::setState(STATE_FORCE_QUIT);
}
else if (event.getId() == "addEntry")
{
@@ -328,7 +329,7 @@ void ServerDialog::keyPressed(gcn::KeyEvent &keyEvent)
if (key.getValue() == Key::ESCAPE)
{
- state = STATE_EXIT;
+ Client::setState(STATE_EXIT);
}
else if (key.getValue() == Key::ENTER)
{