zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-30 07:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #435 from Edward850/pauseext-fix

Browse source 
Fix lost focus loosing network data
This commit is contained in:
coelckers 2015-12-07 12:52:23 +01:00
commit 94c397b868
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/d_net.cpp
View file

@ -973,7 +973,7 @@ void NetUpdate (void)
{ {
I_StartTic (); I_StartTic ();
D_ProcessEvents (); D_ProcessEvents ();
if ((maketic - gametic) / ticdup >= BACKUPTICS/2-1) if (pauseext || (maketic - gametic) / ticdup >= BACKUPTICS/2-1)
break; // can't hold any more break; // can't hold any more
//Printf ("mk:%i ",maketic); //Printf ("mk:%i ",maketic);
@ -1204,7 +1204,7 @@ void NetUpdate (void)
// Send current network delay // Send current network delay
// The number of tics we just made should be removed from the count. // The number of tics we just made should be removed from the count.
netbuffer[k++] = ((maketic - newtics - gametic) / ticdup); netbuffer[k++] = ((maketic - numtics - gametic) / ticdup);
if (numtics > 0) if (numtics > 0)
{ {
@ -1810,7 +1810,8 @@ void TryRunTics (void)
// If paused, do not eat more CPU time than we need, because it // If paused, do not eat more CPU time than we need, because it
// will all be wasted anyway. // will all be wasted anyway.
if (pauseext) r_NoInterpolate = true; if (pauseext)
r_NoInterpolate = true;
bool doWait = cl_capfps || r_NoInterpolate /*|| netgame*/; bool doWait = cl_capfps || r_NoInterpolate /*|| netgame*/;
// get real tics // get real tics
@ -1828,6 +1829,9 @@ void TryRunTics (void)
// get available tics // get available tics
NetUpdate (); NetUpdate ();
if (pauseext)
return;
lowtic = INT_MAX; lowtic = INT_MAX;
numplaying = 0; numplaying = 0;
for (i = 0; i < doomcom.numnodes; i++) for (i = 0; i < doomcom.numnodes; i++)
@ -1935,7 +1939,7 @@ void TryRunTics (void)
C_Ticker (); C_Ticker ();
M_Ticker (); M_Ticker ();
I_GetTime (true); I_GetTime (true);
if (!pauseext) G_Ticker(); G_Ticker();
gametic++; gametic++;
NetUpdate (); // check for new console commands NetUpdate (); // check for new console commands