zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-28 06:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Christoph Oelckers 2022-10-08 09:54:12 +02:00
parent ca521f8a1e
commit 416be99967
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/common/cutscenes/movieplayer.cpp
View file

@ -55,6 +55,7 @@ protected:
{ {
NOSOUNDCUTOFF = 1, NOSOUNDCUTOFF = 1,
FIXEDVIEWPORT = 2, // Forces fixed 640x480 screen size like for Blood's intros. FIXEDVIEWPORT = 2, // Forces fixed 640x480 screen size like for Blood's intros.
NOMUSICCUTOFF = 4,
}; };
int flags; int flags;

3
wadsrc/static/zscript/engine/screenjob.zs
View file

@ -204,6 +204,7 @@ struct MoviePlayer native
{ {
NOSOUNDCUTOFF = 1, NOSOUNDCUTOFF = 1,
FIXEDVIEWPORT = 2, // Forces fixed 640x480 screen size like for Blood's intros. 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); 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() override void Start()
{ {
System.StopMusic(); if (!(flag & MoviePlayer.NOMUSICCUTOFF)) System.StopMusic();
} }

2
wadsrc/static/zscript/games/sw/ui/screens.zs
View file

@ -381,7 +381,7 @@ class SWCutscenes ui
5, SWSnd.DIGI_INTRO_SLASH, 5, SWSnd.DIGI_INTRO_SLASH,
15, SWSnd.DIGI_INTRO_WHIRL); 15, SWSnd.DIGI_INTRO_WHIRL);
runner.Append(new("SWDRealmsScreen").Init()); 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));
} }
} }