summaryrefslogtreecommitdiff
path: root/src/main.h
diff options
context:
space:
mode:
authorBlue <bluesansdouze@gmail.com>2009-05-18 01:19:32 +0200
committerBlue <bluesansdouze@gmail.com>2009-05-18 01:19:32 +0200
commit7b76f0e8c4c489254d7519e2916b951601423801 (patch)
treee4430176f02eeec32ebb56b42933b6416e7895df /src/main.h
parent22685431a23b05d66af28abda488d0891b1c0a34 (diff)
parentaaec4d115cd0048bbc4bed3d8b1d33492b2a51fa (diff)
downloadmana-client-7b76f0e8c4c489254d7519e2916b951601423801.tar.gz
mana-client-7b76f0e8c4c489254d7519e2916b951601423801.tar.bz2
mana-client-7b76f0e8c4c489254d7519e2916b951601423801.tar.xz
mana-client-7b76f0e8c4c489254d7519e2916b951601423801.zip
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/main.h')
-rw-r--r--src/main.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main.h b/src/main.h
index 49a034f5..75343944 100644
--- a/src/main.h
+++ b/src/main.h
@@ -78,7 +78,7 @@
/*
* Client different States
*/
-enum {
+enum State {
STATE_EXIT,
STATE_LOADDATA,
STATE_LOGIN,
@@ -107,15 +107,16 @@ enum {
STATE_LOGOUT_ATTEMPT,
STATE_CONNECT_GAME,
STATE_WAIT,
- STATE_FORCE_QUIT
+ STATE_FORCE_QUIT,
#else
STATE_ACCOUNT,
STATE_CHAR_CONNECT,
STATE_CHAR_SERVER,
STATE_CHAR_NEW,
STATE_CHAR_DEL,
- STATE_CONNECTING
+ STATE_CONNECTING,
#endif
+ STATE_NULL
};
/* length definitions for several char[]s in order
@@ -135,7 +136,7 @@ const short maxSlot = 2;
extern std::string token;
extern char n_server, n_character;
-extern unsigned char state;
+extern State state;
extern std::string errorMessage;
#endif