zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Exhumed: Play sound on Lobotomy logo 

Fixes #224.
This commit is contained in:
Christoph Oelckers 2020-08-21 19:40:18 +02:00
parent 0f3555fc7c
commit a4d0e47389
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/exhumed/src/2d.cpp
View File

@ -424,6 +424,25 @@ void menu_DoPlasma()
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
class DLobotomyScreen : public DImageScreen
{
public:
DLobotomyScreen(FGameTexture *tex, int fade) : DImageScreen(tex, fade)
{}
int Frame(uint64_t clock, bool skiprequest) override
{
if (clock == 0) PlayLocalSound(StaticSound[kSoundJonLaugh2], 7000, false, CHANF_UI);
return DImageScreen::Frame(clock, skiprequest);
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static const short skullDurations[] = { 6, 25, 43, 50, 68, 78, 101, 111, 134, 158, 173, 230, 600 }; static const short skullDurations[] = { 6, 25, 43, 50, 68, 78, 101, 111, 134, 158, 173, 230, 600 };
class DMainTitle : public DScreenJob class DMainTitle : public DScreenJob
@ -534,7 +553,7 @@ void DoTitle(CompletionFunc completion)
int job = 0; int job = 0;
jobs[job++] = { Create<DImageScreen>(tileGetTexture(EXHUMED ? kTileBMGLogo : kTilePIELogo), DScreenJob::fadein | DScreenJob::fadeout) }; jobs[job++] = { Create<DImageScreen>(tileGetTexture(EXHUMED ? kTileBMGLogo : kTilePIELogo), DScreenJob::fadein | DScreenJob::fadeout) };
jobs[job++] = { Create<DImageScreen>(tileGetTexture(seq_GetSeqPicnum(kSeqScreens, 0, 0)), DScreenJob::fadein | DScreenJob::fadeout) }; jobs[job++] = { Create<DLobotomyScreen>(tileGetTexture(seq_GetSeqPicnum(kSeqScreens, 0, 0)), DScreenJob::fadein | DScreenJob::fadeout) };
jobs[job++] = { PlayMovie("book.mov") }; jobs[job++] = { PlayMovie("book.mov") };
jobs[job++] = { Create<DMainTitle>() }; jobs[job++] = { Create<DMainTitle>() };

5
source/exhumed/src/sound.cpp
View File

@ -727,11 +727,6 @@ void PlayTitleSound(void)
PlayLocalSound(StaticSound[kSoundItemSpecial], 0, false, CHANF_UI); PlayLocalSound(StaticSound[kSoundItemSpecial], 0, false, CHANF_UI);
} }
void PlayLogoSound(void)
{
PlayLocalSound(StaticSound[kSoundJonLaugh2], 7000, false, CHANF_UI);
}
void PlayGameOverSound(void) void PlayGameOverSound(void)
{ {
PlayLocalSound(StaticSound[kSoundJonLaugh2], 0, false, CHANF_UI); PlayLocalSound(StaticSound[kSoundJonLaugh2], 0, false, CHANF_UI);

1
source/exhumed/src/sound.h
View File

@ -144,7 +144,6 @@ void StopSpriteSound(short nSprite);
void StartSwirlies(); void StartSwirlies();
void UpdateSwirlies(); void UpdateSwirlies();
void PlayLogoSound(void);
void PlayTitleSound(void); void PlayTitleSound(void);
void PlayGameOverSound(void); void PlayGameOverSound(void);