- fixed: SW's intro video must not stop playing music.

ZDoom · Aug 3, 2023 · 2a9a503 · 2a9a503
1 parent 7c9de2a
commit 2a9a503
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/wadsrc/static/zscript/engine/screenjob.zs b/wadsrc/static/zscript/engine/screenjob.zs
@@ -204,6 +204,7 @@ struct MoviePlayer native
 	{
 		NOSOUNDCUTOFF = 1,
 		FIXEDVIEWPORT = 2,	// Forces fixed 640x480 screen size like for Blood's intros.
+		NOMUSICCUTOFF = 4,
 	}
 
 	native static MoviePlayer Create(String filename, Array<int> soundinfo, int flags, int frametime, int firstframetime, int lastframetime);
@@ -236,7 +237,7 @@ class MoviePlayerJob : SkippableScreenJob
 
 	override void Start()
 	{
-		System.StopMusic();
+		if (!(flag & MoviePlayer.NOMUSICCUTOFF)) System.StopMusic();
 	}
 
 

diff --git a/wadsrc/static/zscript/games/sw/ui/screens.zs b/wadsrc/static/zscript/games/sw/ui/screens.zs
@@ -381,7 +381,7 @@ class SWCutscenes ui
 				5, SWSnd.DIGI_INTRO_SLASH,
 				15, SWSnd.DIGI_INTRO_WHIRL);
 			runner.Append(new("SWDRealmsScreen").Init());
-			runner.Append(MoviePlayerJob.CreateWithSoundinfo("sw.anm", soundinfo, MoviePlayer.NOSOUNDCUTOFF, 8, 360, 128)); 
+			runner.Append(MoviePlayerJob.CreateWithSoundinfo("sw.anm", soundinfo, MoviePlayer.NOSOUNDCUTOFF | MoviePlayer.NOMUSICCUTOFF, 8, 360, 128)); 
 		}
 	}