zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-28 23:11:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'NetBug' of https://github.com/ChillyDoom/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2015-02-12 19:12:13 +01:00
commit d8d2058ec6
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/d_net.cpp
View file

@ -107,7 +107,7 @@ int resendcount[MAXNETNODES];
unsigned int lastrecvtime[MAXPLAYERS]; // [RH] Used for pings unsigned int lastrecvtime[MAXPLAYERS]; // [RH] Used for pings
unsigned int currrecvtime[MAXPLAYERS]; unsigned int currrecvtime[MAXPLAYERS];
unsigned int lastglobalrecvtime; // Identify the last time a packet was recieved. unsigned int lastglobalrecvtime; // Identify the last time a packet was received.
bool hadlate; bool hadlate;
int netdelay[MAXNETNODES][BACKUPTICS]; // Used for storing network delay times. int netdelay[MAXNETNODES][BACKUPTICS]; // Used for storing network delay times.
int lastaverage; int lastaverage;
@ -1861,7 +1861,7 @@ void TryRunTics (void)
if (counts == 0 && !doWait) if (counts == 0 && !doWait)
{ {
// Check possible stall conditions // Check possible stall conditions
Net_CheckLastRecieved(counts); Net_CheckLastReceived(counts);
if (realtics >= 1) if (realtics >= 1)
{ {
C_Ticker(); C_Ticker();
@ -1897,7 +1897,7 @@ void TryRunTics (void)
I_Error ("TryRunTics: lowtic < gametic"); I_Error ("TryRunTics: lowtic < gametic");
// Check possible stall conditions // Check possible stall conditions
Net_CheckLastRecieved (counts); Net_CheckLastReceived (counts);
// don't stay in here forever -- give the menu a chance to work // don't stay in here forever -- give the menu a chance to work
if (I_GetTime (false) - entertic >= 1) if (I_GetTime (false) - entertic >= 1)
@ -1945,9 +1945,9 @@ void TryRunTics (void)
} }
} }
void Net_CheckLastRecieved (int counts) void Net_CheckLastReceived (int counts)
{ {
// [Ed850] Check to see the last time a packet was recieved. // [Ed850] Check to see the last time a packet was received.
// If it's longer then 3 seconds, a node has likely stalled. // If it's longer then 3 seconds, a node has likely stalled.
if (I_GetTime(false) - lastglobalrecvtime >= TICRATE * 3) if (I_GetTime(false) - lastglobalrecvtime >= TICRATE * 3)
{ {
@ -1974,11 +1974,11 @@ void Net_CheckLastRecieved (int counts)
} }
else else
{ //Send a resend request to the Arbitrator, as it's obvious we are stuck here. { //Send a resend request to the Arbitrator, as it's obvious we are stuck here.
if (debugfile && !players[playerfornode[Net_Arbitrator]].waiting) if (debugfile && !players[Net_Arbitrator].waiting)
fprintf(debugfile, "Arbitrator is slow (%i to %i)\n", fprintf(debugfile, "Arbitrator is slow (%i to %i)\n",
nettics[Net_Arbitrator], gametic + counts); nettics[nodeforplayer[Net_Arbitrator]], gametic + counts);
//Send resend request to the Arbitrator. Also mark the Arbitrator as waiting to display it in the hud. //Send resend request to the Arbitrator. Also mark the Arbitrator as waiting to display it in the hud.
remoteresend[Net_Arbitrator] = players[playerfornode[Net_Arbitrator]].waiting = hadlate = true; remoteresend[nodeforplayer[Net_Arbitrator]] = players[Net_Arbitrator].waiting = hadlate = true;
} }
} }
} }

2
src/d_net.h
View file

@ -115,7 +115,7 @@ void D_QuitNetGame (void);
void TryRunTics (void); void TryRunTics (void);
//Use for checking to see if the netgame has stalled //Use for checking to see if the netgame has stalled
void Net_CheckLastRecieved(int); void Net_CheckLastReceived(int);
// [RH] Functions for making and using special "ticcmds" // [RH] Functions for making and using special "ticcmds"
void Net_NewMakeTic (); void Net_NewMakeTic ();