summaryrefslogtreecommitdiff
path: root/src/network/core
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2010-04-11 17:17:12 +0000
committersmatz <smatz@openttd.org>2010-04-11 17:17:12 +0000
commit11d6e21c3ac658b065b64c5c9d0f43c45d7966db (patch)
tree1b1d234a24302144d7a5fe4907a4263a06a436f6 /src/network/core
parentd2dc3a2e2b76959162cb57a641c8db45787a8583 (diff)
downloadopenttd-11d6e21c3ac658b065b64c5c9d0f43c45d7966db.tar.xz
(svn r19607) -Codechange: use different packet types instead of packet subtypes
Diffstat (limited to 'src/network/core')
-rw-r--r--src/network/core/tcp_game.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/network/core/tcp_game.h b/src/network/core/tcp_game.h
index a678c247a..59c1c4cc3 100644
--- a/src/network/core/tcp_game.h
+++ b/src/network/core/tcp_game.h
@@ -35,8 +35,10 @@ enum {
PACKET_CLIENT_COMPANY_INFO,
PACKET_SERVER_COMPANY_INFO,
PACKET_SERVER_CLIENT_INFO,
- PACKET_SERVER_NEED_PASSWORD,
- PACKET_CLIENT_PASSWORD,
+ PACKET_SERVER_NEED_GAME_PASSWORD,
+ PACKET_SERVER_NEED_COMPANY_PASSWORD,
+ PACKET_CLIENT_GAME_PASSWORD,
+ PACKET_CLIENT_COMPANY_PASSWORD,
PACKET_SERVER_WELCOME,
PACKET_CLIENT_GETMAP,
PACKET_SERVER_WAIT,
@@ -75,7 +77,8 @@ struct CommandPacket;
/** Status of a client */
enum ClientStatus {
STATUS_INACTIVE, ///< The client is not connected nor active
- STATUS_AUTHORIZING,///< The client is authorizing
+ STATUS_AUTH_GAME, ///< The client is authorizing with game (server) password
+ STATUS_AUTH_COMPANY, ///< The client is authorizing with company password
STATUS_AUTH, ///< The client is authorized
STATUS_MAP_WAIT, ///< The client is waiting as someone else is downloading the map
STATUS_MAP, ///< The client is downloading the map