dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r19808) -Codechange: NetworkCalculateLag returned an uint, so keep it that way

Browse Source
This commit is contained in:
rubidium
2010-05-13 08:59:50 +00:00
parent b4747b00e6
commit 5732bdcdb9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/network_server.cpp
View File

@@ -1641,7 +1641,7 @@ void NetworkServer_Tick(bool send_frame)
/* Check if the speed of the client is what we can expect from a client */ /* Check if the speed of the client is what we can expect from a client */
if (cs->status == STATUS_ACTIVE) { if (cs->status == STATUS_ACTIVE) {
/* 1 lag-point per day */ /* 1 lag-point per day */
int lag = NetworkCalculateLag(cs) / DAY_TICKS; uint lag = NetworkCalculateLag(cs) / DAY_TICKS;
if (lag > 0) { if (lag > 0) {
if (lag > 3) { if (lag > 3) {
/* Client did still not report in after 4 game-day, drop him /* Client did still not report in after 4 game-day, drop him
@@ -1660,13 +1660,13 @@ void NetworkServer_Tick(bool send_frame)
cs->lag_test = 0; cs->lag_test = 0;
} }
} else if (cs->status == STATUS_PRE_ACTIVE) { } else if (cs->status == STATUS_PRE_ACTIVE) {
int lag = NetworkCalculateLag(cs); uint lag = NetworkCalculateLag(cs);
if (lag > _settings_client.network.max_join_time) { if (lag > _settings_client.network.max_join_time) {
IConsolePrintF(CC_ERROR,"Client #%d is dropped because it took longer than %d ticks for him to join", cs->client_id, _settings_client.network.max_join_time); IConsolePrintF(CC_ERROR,"Client #%d is dropped because it took longer than %d ticks for him to join", cs->client_id, _settings_client.network.max_join_time);
NetworkCloseClient(cs, NETWORK_RECV_STATUS_SERVER_ERROR); NetworkCloseClient(cs, NETWORK_RECV_STATUS_SERVER_ERROR);
} }
} else if (cs->status == STATUS_INACTIVE) { } else if (cs->status == STATUS_INACTIVE) {
int lag = NetworkCalculateLag(cs); uint lag = NetworkCalculateLag(cs);
if (lag > 4 * DAY_TICKS) { if (lag > 4 * DAY_TICKS) {
IConsolePrintF(CC_ERROR,"Client #%d is dropped because it took longer than %d ticks to start the joining process", cs->client_id, 4 * DAY_TICKS); IConsolePrintF(CC_ERROR,"Client #%d is dropped because it took longer than %d ticks to start the joining process", cs->client_id, 4 * DAY_TICKS);
NetworkCloseClient(cs, NETWORK_RECV_STATUS_SERVER_ERROR); NetworkCloseClient(cs, NETWORK_RECV_STATUS_SERVER_ERROR);
@@ -1724,7 +1724,7 @@ void NetworkServerShowStatusToConsole()
NetworkClientSocket *cs; NetworkClientSocket *cs;
FOR_ALL_CLIENT_SOCKETS(cs) { FOR_ALL_CLIENT_SOCKETS(cs) {
int lag = NetworkCalculateLag(cs); uint lag = NetworkCalculateLag(cs);
NetworkClientInfo *ci = cs->GetInfo(); NetworkClientInfo *ci = cs->GetInfo();
const char *status; const char *status;