zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-29 13:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: In the ending cutscene of the first episode, stop the music only when entering the summary screen.

Browse source
This commit is contained in:
Christoph Oelckers 2020-09-27 20:16:03 +02:00
parent 5d35d02c87
commit 3a50f82498
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/games/duke/src/2d_d.cpp
View file

@ -613,15 +613,17 @@ static void bonussequence_d(int num, JobDesc *jobs, int &job)
{ {
case 0: case 0:
jobs[job++] = { Create<DEpisode1End1>(), nullptr }; jobs[job++] = { Create<DEpisode1End1>(), nullptr };
jobs[job++] = { Create<DImageScreen>(E1ENDSCREEN, DScreenJob::fadein|DScreenJob::fadeout, 0x7fffffff), nullptr }; jobs[job++] = { Create<DImageScreen>(E1ENDSCREEN, DScreenJob::fadein|DScreenJob::fadeout, 0x7fffffff), []() { Mus_Stop(); } };
break; break;
case 1: case 1:
Mus_Stop();
jobs[job++] = { PlayVideo("cineov2.anm", cineov2sound, framespeed_18), []() { S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI); } }; jobs[job++] = { PlayVideo("cineov2.anm", cineov2sound, framespeed_18), []() { S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI); } };
jobs[job++] = { Create<DImageScreen>(E2ENDSCREEN, DScreenJob::fadein | DScreenJob::fadeout, 0x7fffffff), []() { FX_StopAllSounds(); } }; jobs[job++] = { Create<DImageScreen>(E2ENDSCREEN, DScreenJob::fadein | DScreenJob::fadeout, 0x7fffffff), []() { FX_StopAllSounds(); } };
break; break;
case 2: case 2:
Mus_Stop();
if (g_gameType & GAMEFLAG_DUKEDC) if (g_gameType & GAMEFLAG_DUKEDC)
{ {
jobs[job++] = { PlayVideo("radlogo.anm", dukedcsound, framespeed_10), nullptr }; jobs[job++] = { PlayVideo("radlogo.anm", dukedcsound, framespeed_10), nullptr };
@ -637,6 +639,7 @@ static void bonussequence_d(int num, JobDesc *jobs, int &job)
break; break;
case 3: case 3:
Mus_Stop();
jobs[job++] = { PlayVideo("vol4e1.anm", vol4e1, framespeed_10), nullptr }; jobs[job++] = { PlayVideo("vol4e1.anm", vol4e1, framespeed_10), nullptr };
jobs[job++] = { PlayVideo("vol4e2.anm", vol4e2, framespeed_10), nullptr }; jobs[job++] = { PlayVideo("vol4e2.anm", vol4e2, framespeed_10), nullptr };
jobs[job++] = { PlayVideo("vol4e3.anm", vol4e3, framespeed_10), []() { S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI); } }; jobs[job++] = { PlayVideo("vol4e3.anm", vol4e3, framespeed_10), []() { S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI); } };
@ -646,6 +649,7 @@ static void bonussequence_d(int num, JobDesc *jobs, int &job)
break; break;
case 4: case 4:
Mus_Stop();
jobs[job++] = { Create<DEpisode5End>(), []() { FX_StopAllSounds(); } }; jobs[job++] = { Create<DEpisode5End>(), []() { FX_StopAllSounds(); } };
break; break;
} }
@ -1002,12 +1006,13 @@ void dobonus_d(int bonusonly, const CompletionFunc& completion)
int job = 0; int job = 0;
FX_StopAllSounds(); FX_StopAllSounds();
Mus_Stop();
if (bonusonly < 0 && numplayers < 2 && ud.from_bonus == 0) if (bonusonly < 0 && numplayers < 2 && ud.from_bonus == 0)
{ {
bonussequence_d(volfromlevelnum(currentLevel->levelNumber), jobs, job); bonussequence_d(volfromlevelnum(currentLevel->levelNumber), jobs, job);
} }
else
Mus_Stop();
if (playerswhenstarted > 1 && ud.coop != 1) if (playerswhenstarted > 1 && ud.coop != 1)
{ {