mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20937) -Codechange: move some variables from client/server to server only

release/1.1
rubidium 2010-10-15 20:29:59 +00:00
parent f712055002
commit c9cbab14ea
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/core/tcp_game.cpp
View File

@ -27,7 +27,6 @@
*/ */
NetworkGameSocketHandler::NetworkGameSocketHandler(SOCKET s) NetworkGameSocketHandler::NetworkGameSocketHandler(SOCKET s)
{ {
this->status = STATUS_INACTIVE;
this->sock = s; this->sock = s;
this->last_frame = _frame_counter; this->last_frame = _frame_counter;
this->last_frame_server = _frame_counter; this->last_frame_server = _frame_counter;

11
src/network/core/tcp_game.h
View File

@ -163,15 +163,10 @@ protected:
NetworkGameSocketHandler(SOCKET s); NetworkGameSocketHandler(SOCKET s);
public: public:
ClientID client_id; ///< Client identifier ClientID client_id; ///< Client identifier
uint32 last_frame; ///< Last frame we have executed uint32 last_frame; ///< Last frame we have executed
uint32 last_frame_server; ///< Last frame the server has 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
CommandQueue incoming_queue; ///< The command-queue awaiting handling CommandQueue incoming_queue; ///< The command-queue awaiting handling
CommandQueue outgoing_queue; ///< The command-queue awaiting delivery
NetworkRecvStatus CloseConnection(bool error = true); NetworkRecvStatus CloseConnection(bool error = true);
virtual NetworkRecvStatus CloseConnection(NetworkRecvStatus status) = 0; virtual NetworkRecvStatus CloseConnection(NetworkRecvStatus status) = 0;

1
src/network/network_server.cpp
View File

@ -55,6 +55,7 @@ INSTANTIATE_POOL_METHODS(NetworkClientSocket)
*/ */
ServerNetworkGameSocketHandler::ServerNetworkGameSocketHandler(SOCKET s) : NetworkGameSocketHandler(s) ServerNetworkGameSocketHandler::ServerNetworkGameSocketHandler(SOCKET s) : NetworkGameSocketHandler(s)
{ {
this->status = STATUS_INACTIVE;
this->client_id = _network_client_id++; this->client_id = _network_client_id++;
NetworkClientInfo *ci = new NetworkClientInfo(this->client_id); NetworkClientInfo *ci = new NetworkClientInfo(this->client_id);
this->SetInfo(ci); this->SetInfo(ci);

5
src/network/network_server.h
View File

@ -47,7 +47,12 @@ protected:
NetworkRecvStatus SendWait(); NetworkRecvStatus SendWait();
NetworkRecvStatus SendNeedGamePassword(); NetworkRecvStatus SendNeedGamePassword();
NetworkRecvStatus SendNeedCompanyPassword(); NetworkRecvStatus SendNeedCompanyPassword();
public: 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(SOCKET s);
~ServerNetworkGameSocketHandler(); ~ServerNetworkGameSocketHandler();