Mercurial > hg > openttd
changeset 16236:a01facac76e5 draft
(svn r20937) -Codechange: move some variables from client/server to server only
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Fri, 15 Oct 2010 20:29:59 +0000 |
| parents | 25d9cd206abc |
| children | cf3d31cf5da4 |
| files | src/network/core/tcp_game.cpp src/network/core/tcp_game.h src/network/network_server.cpp src/network/network_server.h |
| diffstat | 4 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/network/core/tcp_game.cpp +++ b/src/network/core/tcp_game.cpp @@ -27,7 +27,6 @@ */ NetworkGameSocketHandler::NetworkGameSocketHandler(SOCKET s) { - this->status = STATUS_INACTIVE; this->sock = s; this->last_frame = _frame_counter; this->last_frame_server = _frame_counter;
--- a/src/network/core/tcp_game.h +++ b/src/network/core/tcp_game.h @@ -163,15 +163,10 @@ NetworkGameSocketHandler(SOCKET s); public: - ClientID client_id; ///< Client identifier - uint32 last_frame; ///< Last frame we have executed - uint32 last_frame_server; ///< Last frame the server has executed - byte lag_test; ///< Byte used for lag-testing the client - - ClientStatus status; ///< Status of this client - + ClientID client_id; ///< Client identifier + uint32 last_frame; ///< Last frame we have executed + uint32 last_frame_server; ///< Last frame the server has executed CommandQueue incoming_queue; ///< The command-queue awaiting handling - CommandQueue outgoing_queue; ///< The command-queue awaiting delivery NetworkRecvStatus CloseConnection(bool error = true); virtual NetworkRecvStatus CloseConnection(NetworkRecvStatus status) = 0;
--- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -55,6 +55,7 @@ */ ServerNetworkGameSocketHandler::ServerNetworkGameSocketHandler(SOCKET s) : NetworkGameSocketHandler(s) { + this->status = STATUS_INACTIVE; this->client_id = _network_client_id++; NetworkClientInfo *ci = new NetworkClientInfo(this->client_id); this->SetInfo(ci);
--- a/src/network/network_server.h +++ b/src/network/network_server.h @@ -47,7 +47,12 @@ NetworkRecvStatus SendWait(); NetworkRecvStatus SendNeedGamePassword(); NetworkRecvStatus SendNeedCompanyPassword(); + public: + byte lag_test; ///< Byte used for lag-testing the client + ClientStatus status; ///< Status of this client + CommandQueue outgoing_queue; ///< The command-queue awaiting delivery + ServerNetworkGameSocketHandler(SOCKET s); ~ServerNetworkGameSocketHandler();