diff options
| author | David Athay <ko2fan@gmail.com> | 2009-05-21 10:20:32 +0100 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-05-21 10:20:32 +0100 |
| commit | 2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81 (patch) | |
| tree | 293d4922893dfffcc065604743116e653c3b8d37 /src/main.h | |
| parent | dc1eb0895382451b1c79c60ecb7ca7dbbec89681 (diff) | |
| parent | 244b0d9b46128ab3498da078020c8bbf8c65f69f (diff) | |
| download | mana-client-2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81.tar.gz mana-client-2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81.tar.bz2 mana-client-2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81.tar.xz mana-client-2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -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 |