summaryrefslogtreecommitdiff
path: root/src/client.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-14 17:06:02 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-14 17:06:02 +0300
commit6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d (patch)
treef1acb027394af1aec49790354df97da4665488b7 /src/client.h
parenta7d7346b9eb3fa62a8912e31d5c00f8e05390425 (diff)
downloadmanaverse-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.gz
manaverse-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.bz2
manaverse-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.xz
manaverse-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.zip
another fixes from cpplint.
Diffstat (limited to 'src/client.h')
-rw-r--r--src/client.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/client.h b/src/client.h
index d1a3aa047..1a591c428 100644
--- a/src/client.h
+++ b/src/client.h
@@ -51,8 +51,6 @@ class QuitDialog;
*/
static const int MILLISECONDS_IN_A_TICK = 10;
-//manaserv uses 9601
-//static const short DEFAULT_PORT = 9601;
static const short DEFAULT_PORT = 6901;
extern volatile int fps;
@@ -93,32 +91,32 @@ enum State
STATE_PRE_LOGIN,
STATE_LOGIN,
STATE_LOGIN_ATTEMPT,
- STATE_WORLD_SELECT, // 5
+ STATE_WORLD_SELECT, // 5
STATE_WORLD_SELECT_ATTEMPT,
STATE_UPDATE,
STATE_LOAD_DATA,
STATE_GET_CHARACTERS,
- STATE_CHAR_SELECT, // 10
+ STATE_CHAR_SELECT, // 10
STATE_CONNECT_GAME,
STATE_GAME,
- STATE_CHANGE_MAP, // Switch map-server/gameserver
+ STATE_CHANGE_MAP, // Switch map-server/gameserver
STATE_LOGIN_ERROR,
- STATE_ACCOUNTCHANGE_ERROR, // 15
+ STATE_ACCOUNTCHANGE_ERROR, // 15
STATE_REGISTER_PREP,
STATE_REGISTER,
STATE_REGISTER_ATTEMPT,
STATE_CHANGEPASSWORD,
- STATE_CHANGEPASSWORD_ATTEMPT, // 20
+ STATE_CHANGEPASSWORD_ATTEMPT, // 20
STATE_CHANGEPASSWORD_SUCCESS,
STATE_CHANGEEMAIL,
STATE_CHANGEEMAIL_ATTEMPT,
STATE_CHANGEEMAIL_SUCCESS,
- STATE_UNREGISTER, // 25
+ STATE_UNREGISTER, // 25
STATE_UNREGISTER_ATTEMPT,
STATE_UNREGISTER_SUCCESS,
STATE_SWITCH_SERVER,
STATE_SWITCH_LOGIN,
- STATE_SWITCH_CHARACTER, // 30
+ STATE_SWITCH_CHARACTER, // 30
STATE_LOGOUT_ATTEMPT,
STATE_WAIT,
STATE_EXIT,
@@ -407,4 +405,4 @@ private:
int mButtonSpacing;
};
-#endif // CLIENT_H
+#endif // CLIENT_H