From 3e8ff96e6bc369117a46af52b954cdeb94501522 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 5 Aug 2020 22:57:45 +0200
Subject: [PATCH] - added workaround for DukeDC's ending cutscene which was
 abusing undefined behavior in the original code.

---
 source/core/gamecontrol.h        |  2 +-
 source/core/searchpaths.cpp      |  1 +
 source/games/duke/src/2d_d.cpp   | 21 +++++++++++++++++----
 wadsrc/static/engine/grpinfo.txt |  8 ++++----
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/source/core/gamecontrol.h b/source/core/gamecontrol.h
index d39fee2e7..f667108f7 100644
--- a/source/core/gamecontrol.h
+++ b/source/core/gamecontrol.h
@@ -110,7 +110,7 @@ enum
 	GAMEFLAG_EXHUMED	= 0x00004000,
 	GAMEFLAG_PSEXHUMED  = GAMEFLAG_POWERSLAVE | GAMEFLAG_EXHUMED,	// the two games really are the same, except for the name and the publisher.
 	GAMEFLAG_WORLDTOUR = 0x00008000,
-	GAMEFLAG_STANDALONE = 0x00010000,
+	GAMEFLAG_DUKEDC = 0x00010000,
 	GAMEFLAGMASK        = 0x0000FFFF, // flags allowed from grpinfo
 
 	// We still need these for the parsers.
diff --git a/source/core/searchpaths.cpp b/source/core/searchpaths.cpp
index 0e552bf9c..3df95fb39 100644
--- a/source/core/searchpaths.cpp
+++ b/source/core/searchpaths.cpp
@@ -399,6 +399,7 @@ static TArray<GrpInfo> ParseGrpInfo(const char *fn, FileReader &fr, TMap<FString
 	FlagMap.Insert("GAMEFLAG_SW", GAMEFLAG_SW);
 	FlagMap.Insert("GAMEFLAG_POWERSLAVE", GAMEFLAG_POWERSLAVE);
 	FlagMap.Insert("GAMEFLAG_EXHUMED", GAMEFLAG_EXHUMED);
+	FlagMap.Insert("GAMEFLAG_DUKEDC", GAMEFLAG_DUKEDC);
 
 	FScanner sc;
 	auto mem = fr.Read();
diff --git a/source/games/duke/src/2d_d.cpp b/source/games/duke/src/2d_d.cpp
index a16e3205b..aaf2de654 100644
--- a/source/games/duke/src/2d_d.cpp
+++ b/source/games/duke/src/2d_d.cpp
@@ -548,6 +548,12 @@ static void bonussequence_d(int num, JobDesc *jobs, int &job)
 		{ -1,-1 }
 	};
 
+	static const AnimSound dukedcsound[] =
+	{
+		{ 144, ENDSEQVOL3SND3 + 1 },
+		{ -1,-1 }
+	};
+
 	static const AnimSound vol4e1[] =
 	{
 		{ 3, DUKE_UNDERWATER+1 },
@@ -591,10 +597,17 @@ static void bonussequence_d(int num, JobDesc *jobs, int &job)
 		break;
 
 	case 2:
-		jobs[job++] = { PlayVideo("cineov3.anm", cineov3sound, framespeed_10), nullptr };
-		jobs[job++] = { Create<DBlackScreen>(200), []() { FX_StopAllSounds(); } };
-		jobs[job++] = { Create<DEpisode3End>(), []() { if (!PLUTOPAK) S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI); } };
-		if (!PLUTOPAK) jobs[job++] = { Create<DImageScreen>(TexMan.GetGameTextureByName("DUKETEAM.ANM", false, FTextureManager::TEXMAN_ForceLookup)), []() { FX_StopAllSounds(); } };
+		if (g_gameType & GAMEFLAG_DUKEDC)
+		{
+			jobs[job++] = { PlayVideo("radlogo.anm", dukedcsound, framespeed_10), nullptr };
+		}
+		else
+		{
+			jobs[job++] = { PlayVideo("cineov3.anm", cineov3sound, framespeed_10), nullptr };
+			jobs[job++] = { Create<DBlackScreen>(200), []() { FX_StopAllSounds(); } };
+			jobs[job++] = { Create<DEpisode3End>(), []() { if (!PLUTOPAK) S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI); } };
+			if (!PLUTOPAK) jobs[job++] = { Create<DImageScreen>(TexMan.GetGameTextureByName("DUKETEAM.ANM", false, FTextureManager::TEXMAN_ForceLookup)), []() { FX_StopAllSounds(); } };
+		}
 		break;
 
 	case 3:
diff --git a/wadsrc/static/engine/grpinfo.txt b/wadsrc/static/engine/grpinfo.txt
index 2346ac561..e52fb0d07 100644
--- a/wadsrc/static/engine/grpinfo.txt
+++ b/wadsrc/static/engine/grpinfo.txt
@@ -159,7 +159,7 @@ grpinfo
 	name "Duke it out in D.C. (1.3D)"
 	size 7926624
 	crc DUKEDC13_CRC
-	flags GAMEFLAG_DUKE|GAMEFLAG_ADDON
+	flags GAMEFLAG_DUKE|GAMEFLAG_ADDON|GAMEFLAG_DUKEDC
 	dependency DUKE13_CRC
 	gamefilter "Duke.DukeDC"
 }
@@ -169,7 +169,7 @@ grpinfo
 	name "Duke it out in D.C."
 	size 8225517
 	crc DUKEDCPP_CRC
-	flags GAMEFLAG_DUKE|GAMEFLAG_ADDON
+	flags GAMEFLAG_DUKE|GAMEFLAG_ADDON|GAMEFLAG_DUKEDC
 	dependency DUKE15_CRC
 	gamefilter "Duke.DukeDC"
 }
@@ -179,7 +179,7 @@ grpinfo
 	name "Duke it out in D.C."
 	size 8410183
 	crc DUKEDC_CRC
-	flags GAMEFLAG_DUKE|GAMEFLAG_ADDON
+	flags GAMEFLAG_DUKE|GAMEFLAG_ADDON|GAMEFLAG_DUKEDC
 	dependency DUKE15_CRC
 	gamefilter "Duke.DukeDC"
 }
@@ -190,7 +190,7 @@ grpinfo
 	scriptname "DUKEDC.CON"
 	size 8410187
 	crc 0x39A692BF
-	flags GAMEFLAG_DUKE|GAMEFLAG_ADDON
+	flags GAMEFLAG_DUKE|GAMEFLAG_ADDON|GAMEFLAG_DUKEDC
 	dependency DUKE15_CRC
 	gamefilter "Duke.DukeDC"
 }