Merged the tmwserv client with the eAthena client

This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.

In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.

Conflicts:
	Everywhere!

1 files changed, 11 insertions, 2 deletions

diff --git a/src/gui/connection.h b/src/gui/connection.h
index 3caa611f..0e347266 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.h
@@ -22,6 +22,8 @@
 #ifndef CONNECTION_H
 #define CONNECTION_H
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 class ProgressBar;
@@ -31,7 +33,7 @@ class ProgressBar;
  *
  * \ingroup Interface
  */
-class ConnectionDialog : public Window
+class ConnectionDialog : public Window, gcn::ActionListener
 {
     public:
         /**
@@ -39,13 +41,20 @@ class ConnectionDialog : public Window
          *
          * @see Window::Window
          */
-        ConnectionDialog();
+        ConnectionDialog(int previousState);
+
+        /**
+         * Called when the user presses Cancel. Restores the global state to
+         * the previous one.
+         */
+        void action(gcn::ActionEvent const &);
 
         void logic();
 
     private:
         ProgressBar *mProgressBar;
         float mProgress;
+        int mPreviousState;
 };
 
 #endif