- merge DukeDC's end of episode cutscene into BuildE3End.

This will make things a bit easier on the setup side because it eliminates the need for mission pack specific definitions.
This commit is contained in:
Christoph Oelckers 2021-04-26 01:27:04 +02:00
parent 21aa5c9234
commit f077359196

View file

@ -98,33 +98,29 @@ class DukeCutscenes
static void BuildE3End(ScreenJobRunner runner) static void BuildE3End(ScreenJobRunner runner)
{ {
Array<int> soundinfo; if (gameinfo.gameType & GAMEFLAG_DUKEDC)
soundinfo.Pushv( {
1, DukeSnd.WIND_REPEAT + 1, Array<int> soundinfo;
98, DukeSnd.DUKE_GRUNT + 1, soundinfo.Pushv(144, DukeSnd.ENDSEQVOL3SND3 + 1);
102, DukeSnd.THUD + 1, runner.Append(MoviePlayerJob.CreateWithSoundinfo("radlogo.anm", soundinfo, 0, 10, 10, 10));
102, DukeSnd.SQUISHED + 1, }
124, DukeSnd.ENDSEQVOL3SND3 + 1, else
134, DukeSnd.ENDSEQVOL3SND2 + 1, {
158, DukeSnd.PIPEBOMB_EXPLODE + 1); Array<int> soundinfo;
soundinfo.Pushv(
1, DukeSnd.WIND_REPEAT + 1,
98, DukeSnd.DUKE_GRUNT + 1,
102, DukeSnd.THUD + 1,
102, DukeSnd.SQUISHED + 1,
124, DukeSnd.ENDSEQVOL3SND3 + 1,
134, DukeSnd.ENDSEQVOL3SND2 + 1,
158, DukeSnd.PIPEBOMB_EXPLODE + 1);
runner.Append(MoviePlayerJob.CreateWithSoundinfo("cineov3.anm", soundinfo, 0, 10, 10, 10)); runner.Append(MoviePlayerJob.CreateWithSoundinfo("cineov3.anm", soundinfo, 0, 10, 10, 10));
runner.Append(BlackScreen.Create(200, ScreenJob.stopsound)); runner.Append(BlackScreen.Create(200, ScreenJob.stopsound));
runner.Append(new("Episode3End").Init()); runner.Append(new("Episode3End").Init());
if (!Raze.isPlutoPak()) runner.Append(ImageScreen.CreateNamed("DUKETEAM.ANM", ScreenJob.fadein | ScreenJob.fadeout | ScreenJob.stopsound, 0x7fffffff)); if (!Raze.isPlutoPak()) runner.Append(ImageScreen.CreateNamed("DUKETEAM.ANM", ScreenJob.fadein | ScreenJob.fadeout | ScreenJob.stopsound, 0x7fffffff));
} }
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static void BuildDCEnd(ScreenJobRunner runner)
{
Array<int> soundinfo;
soundinfo.Pushv(144, DukeSnd.ENDSEQVOL3SND3 + 1);
runner.Append(MoviePlayerJob.CreateWithSoundinfo("radlogo.anm", soundinfo, 0, 10, 10, 10));
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------