From cbb066f1fb80973ed190179374d9d5cd884cfe4c Mon Sep 17 00:00:00 2001 From: Edward Richardson Date: Thu, 5 Feb 2015 22:43:42 +1300 Subject: [PATCH 1/2] Keep gameticker running to let the thread sleep --- src/d_net.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/d_net.cpp b/src/d_net.cpp index 02ca8c0c4..116c5ab82 100644 --- a/src/d_net.cpp +++ b/src/d_net.cpp @@ -939,7 +939,7 @@ void NetUpdate (void) newtics = nowtime - gametime; gametime = nowtime; - if (newtics <= 0 || pauseext) // nothing new to update or window paused + if (newtics <= 0) // nothing new to update { GetPackets (); return; @@ -1795,6 +1795,7 @@ void TryRunTics (void) // If paused, do not eat more CPU time than we need, because it // will all be wasted anyway. + if (pauseext) r_NoInterpolate = true; bool doWait = cl_capfps || r_NoInterpolate /*|| netgame*/; // get real tics @@ -1919,7 +1920,7 @@ void TryRunTics (void) C_Ticker (); M_Ticker (); I_GetTime (true); - G_Ticker (); + if (!pauseext) G_Ticker(); gametic++; NetUpdate (); // check for new console commands From 5164b78c31a7fac96867456c5ff1581f75e8b720 Mon Sep 17 00:00:00 2001 From: Edward Richardson Date: Thu, 5 Feb 2015 22:44:51 +1300 Subject: [PATCH 2/2] Camera paths would hold indeterminate of the level --- src/g_shared/a_movingcamera.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/g_shared/a_movingcamera.cpp b/src/g_shared/a_movingcamera.cpp index e3db71ff3..83d0d4695 100644 --- a/src/g_shared/a_movingcamera.cpp +++ b/src/g_shared/a_movingcamera.cpp @@ -301,14 +301,14 @@ void APathFollower::Tick () bJustStepped = false; if (CurrNode->args[2]) { - HoldTime = gametic + CurrNode->args[2] * TICRATE / 8; + HoldTime = level.time + CurrNode->args[2] * TICRATE / 8; x = CurrNode->x; y = CurrNode->y; z = CurrNode->z; } } - if (HoldTime > gametic) + if (HoldTime > level.time) return; // Splines must have a previous node.