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

(svn r188) -Fix: network fixes for players with higher latency (sign_de)

release/0.4.5
darkvater 2004-09-08 20:54:56 +00:00
parent 8308432cf9
commit 5ecaebcc6c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
network.c
View File

@ -191,7 +191,8 @@ static int _num_clients;
// keep a history of the 16 most recent seeds to be able to capture out of sync errors. // keep a history of the 16 most recent seeds to be able to capture out of sync errors.
static uint32 _my_seed_list[16][2]; static uint32 _my_seed_list[16][2];
static bool _network_ready_sent; static bool _network_ready_sent;
static uint32 _network_client_timeout; static uint16 _network_ready_ahead = 1;
static uint16 _network_client_timeout;
typedef struct FutureSeeds { typedef struct FutureSeeds {
int32 frame; int32 frame;
@ -539,7 +540,7 @@ static void HandleSyncPacket(SyncPacket *sp)
s1 = TO_LE32(sp->random_seed_1); s1 = TO_LE32(sp->random_seed_1);
s2 = TO_LE32(sp->random_seed_2); s2 = TO_LE32(sp->random_seed_2);
DEBUG(net, 2) ("[NET] sync seeds: [1]=%i rnd[2]=%i", sp->random_seed_1, sp->random_seed_2); DEBUG(net, 3) ("[NET] sync seeds: [1]=%i rnd[2]=%i", sp->random_seed_1, sp->random_seed_2);
if (_frame_counter_srv <= _frame_counter) { if (_frame_counter_srv <= _frame_counter) {
// we are ahead of the server check if the seed is in our list. // we are ahead of the server check if the seed is in our list.
@ -1228,6 +1229,10 @@ static _iconsole_var * NetworkConsoleCmdConnect(byte argc, byte* argv[], byte ar
} else if (argc==3) { } else if (argc==3) {
IConsolePrintF(_iconsole_color_default, "connecting to %s on port %s",argv[1],argv[2]); IConsolePrintF(_iconsole_color_default, "connecting to %s on port %s",argv[1],argv[2]);
NetworkCoreConnectGame(argv[1],atoi(argv[2])); NetworkCoreConnectGame(argv[1],atoi(argv[2]));
} else if (argc==4) {
IConsolePrintF(_iconsole_color_default, "connecting to %s on port %s as player %s",argv[1],argv[2],argv[3]);
_network_playas = atoi(argv[3]);
NetworkCoreConnectGame(argv[1],atoi(argv[2]));
} }
return NULL; return NULL;
} }
@ -1504,7 +1509,8 @@ if (_network_available) {
// initiate network ip list // initiate network ip list
NetworkIPListInit(); NetworkIPListInit();
IConsoleCmdRegister("connect",NetworkConsoleCmdConnect); IConsoleCmdRegister("connect",NetworkConsoleCmdConnect);
IConsoleVarRegister("cfg_client_timeout",&_network_client_timeout,ICONSOLE_VAR_UINT16); IConsoleVarRegister("net_client_timeout",&_network_client_timeout,ICONSOLE_VAR_UINT16);
IConsoleVarRegister("net_ready_ahead",&_network_ready_ahead,ICONSOLE_VAR_UINT16);
} else { } else {
DEBUG(net, 3) ("[NET][Core] FAILED: multiplayer not available"); DEBUG(net, 3) ("[NET][Core] FAILED: multiplayer not available");
} }
@ -1628,9 +1634,9 @@ if (incomming) {
// outgoing // outgoing
if ((_networking) && (!_networking_server) && (_frame_counter+1 >= _frame_counter_max)) { if ((_networking) && (!_networking_server) && (_frame_counter+_network_ready_ahead >= _frame_counter_max)) {
// send the "i" am ready message to the server // send the "i" am ready message to the server
// one frame before "i" reach the frame-limit // [_network_ready_ahead] frame before "i" reach the frame-limit
NetworkSendReadyPacket(); NetworkSendReadyPacket();
} }