zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 17:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: do not play 1.5 intro sounds in 1.3

Browse source 
- Duke: In 1.3, the Duke team image should stay until dismissed manually.
This commit is contained in:
Christoph Oelckers 2020-09-25 18:40:45 +02:00
parent e9326fffe3
commit e7f16f6ff7
1 changed files with 5 additions and 4 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

@ -217,12 +217,12 @@ public:
if (soundanm == 2 && clock >= 280 && clock < 395) if (soundanm == 2 && clock >= 280 && clock < 395)
{ {
soundanm = 3; soundanm = 3;
S_PlaySound(FLY_BY, CHAN_AUTO, CHANF_UI); if (PLUTOPAK) S_PlaySound(FLY_BY, CHAN_AUTO, CHANF_UI);
} }
else if (soundanm == 3 && clock >= 395 && PLUTOPAK) else if (soundanm == 3 && clock >= 395)
{ {
soundanm = 4; soundanm = 4;
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI); if (PLUTOPAK) S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
} }
double scale = clamp(clock - 120, 0, 60) / 64.; double scale = clamp(clock - 120, 0, 60) / 64.;
@ -630,7 +630,8 @@ static void bonussequence_d(int num, JobDesc *jobs, int &job)
jobs[job++] = { PlayVideo("cineov3.anm", cineov3sound, framespeed_10), nullptr }; jobs[job++] = { PlayVideo("cineov3.anm", cineov3sound, framespeed_10), nullptr };
jobs[job++] = { Create<DBlackScreen>(200), []() { FX_StopAllSounds(); } }; jobs[job++] = { Create<DBlackScreen>(200), []() { FX_StopAllSounds(); } };
jobs[job++] = { Create<DEpisode3End>(), []() { if (!PLUTOPAK) S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI); } }; jobs[job++] = { Create<DEpisode3End>(), []() { if (!PLUTOPAK) S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI); } };
if (!PLUTOPAK) jobs[job++] = { Create<DImageScreen>(TexMan.GetGameTextureByName("DUKETEAM.ANM", false, FTextureManager::TEXMAN_ForceLookup)), []() { FX_StopAllSounds(); } }; if (!PLUTOPAK) jobs[job++] = { Create<DImageScreen>(TexMan.GetGameTextureByName("DUKETEAM.ANM", false, FTextureManager::TEXMAN_ForceLookup),
DScreenJob::fadein | DScreenJob::fadeout, 0x7fffffff), []() { FX_StopAllSounds(); } };
} }
break; break;