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

Merge branch 'pause' of https://github.com/Edward850/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2015-02-07 13:03:33 +01:00
commit 6801d0faec
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/d_net.cpp
View file

@ -951,7 +951,7 @@ void NetUpdate (void)
newtics = nowtime - gametime; newtics = nowtime - gametime;
gametime = nowtime; gametime = nowtime;
if (newtics <= 0 || pauseext) // nothing new to update or window paused if (newtics <= 0) // nothing new to update
{ {
GetPackets (); GetPackets ();
return; return;
@ -1810,6 +1810,7 @@ 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;
bool doWait = cl_capfps || r_NoInterpolate /*|| netgame*/; bool doWait = cl_capfps || r_NoInterpolate /*|| netgame*/;
// get real tics // get real tics
@ -1934,7 +1935,7 @@ void TryRunTics (void)
C_Ticker (); C_Ticker ();
M_Ticker (); M_Ticker ();
I_GetTime (true); I_GetTime (true);
G_Ticker (); if (!pauseext) G_Ticker();
gametic++; gametic++;
NetUpdate (); // check for new console commands NetUpdate (); // check for new console commands

4
src/g_shared/a_movingcamera.cpp
View file

@ -301,14 +301,14 @@ void APathFollower::Tick ()
bJustStepped = false; bJustStepped = false;
if (CurrNode->args[2]) if (CurrNode->args[2])
{ {
HoldTime = gametic + CurrNode->args[2] * TICRATE / 8; HoldTime = level.time + CurrNode->args[2] * TICRATE / 8;
x = CurrNode->x; x = CurrNode->x;
y = CurrNode->y; y = CurrNode->y;
z = CurrNode->z; z = CurrNode->z;
} }
} }
if (HoldTime > gametic) if (HoldTime > level.time)
return; return;
// Splines must have a previous node. // Splines must have a previous node.