From 9af093b81815a036bd588eea64df186610d131b8 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 5 Sep 2020 16:21:53 +0200
Subject: [PATCH] - fixed screen job timer when paused

Fixes #343
---
 source/core/screenjob.cpp      | 22 +++++++++++++---------
 source/games/duke/src/2d_d.cpp |  1 -
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/source/core/screenjob.cpp b/source/core/screenjob.cpp
index ba3d0f5ce..b055dc5b5 100644
--- a/source/core/screenjob.cpp
+++ b/source/core/screenjob.cpp
@@ -575,6 +575,7 @@ class ScreenJobRunner
 	int64_t lastTime = -1;
 	int actionState;
 	int terminateState;
+	uint64_t clock = 0;
 
 public:
 	ScreenJobRunner(JobDesc* jobs_, int count, CompletionFunc completion_, bool clearbefore_)
@@ -630,15 +631,17 @@ public:
 		auto now = I_nsTime();
 		bool processed = job.job->ProcessInput();
 		bool skiprequest = inputState.CheckAllInput() && !processed;
-		if (startTime == -1) lastTime = startTime = now;
-
-		if (M_Active())
+		if (startTime == -1)
 		{
-			startTime += now - lastTime;
+			lastTime = startTime = now;
+		}
+		else if (!M_Active())
+		{
+			clock += now - lastTime;
+			if (clock == 0) clock = 1;
 		}
 		lastTime = now;
 
-		auto clock = now - startTime;
 		if (screenfade < 1.f)
 		{
 			float ms = (clock / 1'000'000) / job.job->fadetime;
@@ -649,7 +652,8 @@ public:
 		else job.job->fadestate = DScreenJob::visible;
 		job.job->SetClock(clock);
 		int state = job.job->Frame(clock, skiprequest);
-		startTime -= job.job->GetClock() - clock;
+		clock = job.job->GetClock();
+		if (clock == 0) clock = 1;
 		return state;
 	}
 
@@ -657,13 +661,13 @@ public:
 	{
 		auto now = I_nsTime();
 
-		if (M_Active())
+		if (!M_Active())
 		{
-			startTime += now - lastTime;
+			clock += now - lastTime;
+			if (clock == 0) clock = 1;
 		}
 		lastTime = now;
 
-		auto clock = now - startTime;
 		float ms = (clock / 1'000'000) / jobs[index].job->fadetime;
 		float screenfade2 = clamp(screenfade - ms, 0.f, 1.f);
 		if (!M_Active()) twod->SetScreenFade(screenfade2);
diff --git a/source/games/duke/src/2d_d.cpp b/source/games/duke/src/2d_d.cpp
index 8ba7adad0..3f2d38697 100644
--- a/source/games/duke/src/2d_d.cpp
+++ b/source/games/duke/src/2d_d.cpp
@@ -879,7 +879,6 @@ public:
 
 	int Frame(uint64_t clock, bool skiprequest)
 	{
-		Printf("Clock = %llu\n", clock);
 		if (clock == 0) S_PlayBonusMusic();
 		twod->ClearScreen();
 		int currentclock = int(clock * 120 / 1'000'000'000);