From 77cbd0c238fa2bb01479a77ab378e002ddb92af7 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 23 Jan 2019 22:35:48 +0100
Subject: [PATCH] - copied the changes to DFlashFader in master.

---
 src/g_shared/a_flashfader.cpp | 14 +++++---------
 src/g_shared/a_sharedglobal.h |  4 ++--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/g_shared/a_flashfader.cpp b/src/g_shared/a_flashfader.cpp
index 7bc774da7..5c20205f3 100644
--- a/src/g_shared/a_flashfader.cpp
+++ b/src/g_shared/a_flashfader.cpp
@@ -43,14 +43,10 @@ IMPLEMENT_POINTERS_START(DFlashFader)
 	IMPLEMENT_POINTER(ForWho)
 IMPLEMENT_POINTERS_END
 
-DFlashFader::DFlashFader ()
-{
-}
-
 DFlashFader::DFlashFader (float r1, float g1, float b1, float a1,
 						  float r2, float g2, float b2, float a2,
 						  float time, AActor *who, bool terminate)
-	: TotalTics ((int)(time*TICRATE)), StartTic (level.time), ForWho (who)
+	: TotalTics ((int)(time*TICRATE)), RemainingTics(TotalTics), ForWho (who)
 {
 	Blends[0][0]=r1; Blends[0][1]=g1; Blends[0][2]=b1; Blends[0][3]=a1;
 	Blends[1][0]=r2; Blends[1][1]=g2; Blends[1][2]=b2; Blends[1][3]=a2;
@@ -68,7 +64,7 @@ void DFlashFader::Serialize(FSerializer &arc)
 {
 	Super::Serialize (arc);
 	arc("totaltics", TotalTics)
-		("starttic", StartTic)
+		("remainingtics", RemainingTics)
 		("forwho", ForWho)
 		.Array("blends", Blends[0], 8);
 }
@@ -80,13 +76,13 @@ void DFlashFader::Tick ()
 		Destroy ();
 		return;
 	}
-	if (level.time >= StartTic+TotalTics)
+	if (--RemainingTics <= 0)
 	{
 		SetBlend (1.f);
 		Destroy ();
 		return;
 	}
-	SetBlend ((float)(level.time - StartTic) / (float)TotalTics);
+	SetBlend (1.f - (float)RemainingTics / (float)TotalTics);
 }
 
 void DFlashFader::SetBlend (float time)
@@ -105,6 +101,6 @@ void DFlashFader::SetBlend (float time)
 
 void DFlashFader::Cancel ()
 {
-	TotalTics = level.time - StartTic;
+	RemainingTics = 0;
 	Blends[1][3] = 0.f;
 }
diff --git a/src/g_shared/a_sharedglobal.h b/src/g_shared/a_sharedglobal.h
index 3d7436548..327ff3d7a 100644
--- a/src/g_shared/a_sharedglobal.h
+++ b/src/g_shared/a_sharedglobal.h
@@ -95,11 +95,11 @@ public:
 protected:
 	float Blends[2][4];
 	int TotalTics;
-	int StartTic;
+	int RemainingTics;
 	TObjPtr<AActor*> ForWho;
 	bool Terminate;
 	void SetBlend (float time);
-	DFlashFader ();
+	DFlashFader() = default;
 };
 
 enum