From 98bb8c516dcbc54dd78531371870e4938722b1e1 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 18 May 2021 00:08:32 +0200
Subject: [PATCH] - added missing declarations for RR's intro movies.

---
 .../redneck.redneck/engine/rmapinfo.txt       |  4 +++
 .../redneck.ridesagain/engine/rmapinfo.txt    |  4 +++
 .../redneck.route66/engine/rmapinfo.txt       |  4 +++
 .../static/zscript/games/duke/ui/cutscenes.zs | 36 +++++++++++--------
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/wadsrc/static/filter/redneck.redneck/engine/rmapinfo.txt b/wadsrc/static/filter/redneck.redneck/engine/rmapinfo.txt
index 8d9e1d751..7e4631267 100644
--- a/wadsrc/static/filter/redneck.redneck/engine/rmapinfo.txt
+++ b/wadsrc/static/filter/redneck.redneck/engine/rmapinfo.txt
@@ -111,6 +111,10 @@ map { 2, 8 }
 
 cutscenes
 {
+	intro
+	{
+		function = RRCutscenes.BuildIntro
+	}
 	loadscreen
 	{
 		function = DukeCutscenes.BuildLoading // identical with Duke's
diff --git a/wadsrc/static/filter/redneck.ridesagain/engine/rmapinfo.txt b/wadsrc/static/filter/redneck.ridesagain/engine/rmapinfo.txt
index d6ca9561a..e44fe042d 100644
--- a/wadsrc/static/filter/redneck.ridesagain/engine/rmapinfo.txt
+++ b/wadsrc/static/filter/redneck.ridesagain/engine/rmapinfo.txt
@@ -102,6 +102,10 @@ map { 2, 7 }
 
 cutscenes
 {
+	intro
+	{
+		function = RRCutscenes.BuildRAIntro
+	}
 	loadscreen
 	{
 		function = DukeCutscenes.BuildLoading // identical with Duke's
diff --git a/wadsrc/static/filter/redneck.route66/engine/rmapinfo.txt b/wadsrc/static/filter/redneck.route66/engine/rmapinfo.txt
index 79104d930..9d8b99910 100644
--- a/wadsrc/static/filter/redneck.route66/engine/rmapinfo.txt
+++ b/wadsrc/static/filter/redneck.route66/engine/rmapinfo.txt
@@ -96,6 +96,10 @@ map { 2, 7 }
 
 cutscenes
 {
+	intro
+	{
+		function = RRCutscenes.BuildIntro
+	}
 	loadscreen
 	{
 		function = DukeCutscenes.BuildLoading // identical with Duke's
diff --git a/wadsrc/static/zscript/games/duke/ui/cutscenes.zs b/wadsrc/static/zscript/games/duke/ui/cutscenes.zs
index 690427294..64273904b 100644
--- a/wadsrc/static/zscript/games/duke/ui/cutscenes.zs
+++ b/wadsrc/static/zscript/games/duke/ui/cutscenes.zs
@@ -274,22 +274,30 @@ class RRCutscenes
     {
 		if (!userConfig.nologo)
 		{
-			if (!Raze.isRRRA())
-			{
-				Array<int> soundinfo;
-				soundinfo.Pushv(1, RRSnd.URANUS + 1);
-				runner.Append(MoviePlayerJob.CreateWithSoundinfo("rr_intro.anm", soundinfo, 0, 9, 9, 9));
+			Array<int> soundinfo;
+			soundinfo.Pushv(1, RRSnd.URANUS + 1);
+			runner.Append(MoviePlayerJob.CreateWithSoundinfo("rr_intro.anm", soundinfo, 0, 9, 9, 9));
 
-				soundinfo.Pushv(1, RRSnd.REDNECK2 + 1);
-				runner.Append(MoviePlayerJob.CreateWithSoundinfo("redneck.anm", soundinfo, 0, 9, 9, 9));
+			soundinfo.Pushv(1, RRSnd.REDNECK2 + 1);
+			runner.Append(MoviePlayerJob.CreateWithSoundinfo("redneck.anm", soundinfo, 0, 9, 9, 9));
 
-				soundinfo.Pushv(1, RRSnd.XATRIX + 1);
-				runner.Append(MoviePlayerJob.CreateWithSoundinfo("xatlogo.anm", soundinfo, 0, 9, 9, 9));
-			}
-			else
-			{
-				runner.Append(MoviePlayerJob.Create("redint.mve", 0));
-			}
+			soundinfo.Pushv(1, RRSnd.XATRIX + 1);
+			runner.Append(MoviePlayerJob.CreateWithSoundinfo("xatlogo.anm", soundinfo, 0, 9, 9, 9));
+		}
+	}
+
+
+	//---------------------------------------------------------------------------
+	//
+	//
+	//
+	//---------------------------------------------------------------------------
+
+	static void BuildRAIntro(ScreenJobRunner runner)
+    {
+		if (!userConfig.nologo)
+		{
+			runner.Append(MoviePlayerJob.Create("redint.mve", 0));
 		}
 	}