stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-24 21:31:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

DD hack to pause music during a wipe

Browse source
This commit is contained in:
mazmazz 2018-12-06 07:08:18 -05:00
parent 7852e418d5
commit 8933601507
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/f_wipe.c
View file

@ -27,6 +27,10 @@
#include "d_main.h" #include "d_main.h"
#include "m_misc.h" // movie mode #include "m_misc.h" // movie mode
#ifdef _WINDOWS
#include "s_sound.h" // DD music hack
#endif
#ifdef HWRENDER #ifdef HWRENDER
#include "hardware/hw_main.h" #include "hardware/hw_main.h"
#endif #endif
@ -337,6 +341,16 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
UINT8 wipeframe = 0; UINT8 wipeframe = 0;
fademask_t *fmask; fademask_t *fmask;
#ifdef _WINDOWS
boolean waspaused = false;
// DD HACK: Music doesn't work during wipes, so halt it before the wipe starts
if (S_MusicPlaying() && !S_MusicPaused())
{
S_PauseAudio();
waspaused = true;
}
#endif
paldiv = FixedDiv(257<<FRACBITS, 11<<FRACBITS); paldiv = FixedDiv(257<<FRACBITS, 11<<FRACBITS);
// Init the wipe // Init the wipe
@ -375,5 +389,11 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
M_SaveFrame(); M_SaveFrame();
} }
WipeInAction = false; WipeInAction = false;
#ifdef _WINDOWS
// DD HACK: Music doesn't work during wipes, so resume it after the wipe ends
if (waspaused)
S_ResumeAudio();
#endif
#endif #endif
} }

5
src/p_setup.c
View file

@ -2712,6 +2712,11 @@ boolean P_SetupLevel(boolean skipprecip)
tic_t endtime = starttime + (3*TICRATE)/2; tic_t endtime = starttime + (3*TICRATE)/2;
tic_t nowtime; tic_t nowtime;
#if defined(_WINDOWS)
// DD hack: Music doesn't work when wiping.
// Stop music now because we do a second wipe after a delay
S_StopMusic();
#endif
S_StartSound(NULL, sfx_s3kaf); S_StartSound(NULL, sfx_s3kaf);
F_WipeStartScreen(); F_WipeStartScreen();