summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 0f070dd1..8caef783 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -82,8 +82,6 @@
#include <SDL_image.h>
-#include <guichan/actionlistener.hpp>
-
#include <libxml/parser.h>
#include <getopt.h>
@@ -128,6 +126,7 @@ Game *game = 0;
State state = STATE_START;
std::string errorMessage;
+ErrorListener errorListener;
Sound sound;
Music *bgm;
@@ -649,15 +648,6 @@ static void loadUpdates()
}
}
-class ErrorListener : public gcn::ActionListener
-{
-public:
- void action(const gcn::ActionEvent &event)
- {
- state = STATE_CHOOSE_SERVER;
- }
-} errorListener;
-
class AccountListener : public gcn::ActionListener
{
public:
@@ -678,6 +668,11 @@ public:
} // namespace
+void ErrorListener::action(const gcn::ActionEvent &event)
+{
+ state = STATE_CHOOSE_SERVER;
+}
+
const std::string &getHomeDirectory()
{
return homeDir;