Skip to content
Snippets Groups Projects
Commit 5cdd6a16 authored by Marco Z's avatar Marco Z
Browse files

Attempt to stop music before wipe (doesn't work?!)

parent 89336015
No related branches found
No related tags found
No related merge requests found
...@@ -342,12 +342,15 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu) ...@@ -342,12 +342,15 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
fademask_t *fmask; fademask_t *fmask;
#ifdef _WINDOWS #ifdef _WINDOWS
boolean waspaused = false;
// DD HACK: Music doesn't work during wipes, so halt it before the wipe starts // DD HACK: Music doesn't work during wipes, so halt it before the wipe starts
if (S_MusicPlaying() && !S_MusicPaused()) boolean wasplaying = false;
char musname[7]; UINT16 flags; boolean looping;
S_MusicInfo(musname, &flags, &looping);
if (S_MusicPlaying())
{ {
S_PauseAudio(); S_StopMusic();
waspaused = true; wasplaying = true;
} }
#endif #endif
...@@ -392,8 +395,8 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu) ...@@ -392,8 +395,8 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
#ifdef _WINDOWS #ifdef _WINDOWS
// DD HACK: Music doesn't work during wipes, so resume it after the wipe ends // DD HACK: Music doesn't work during wipes, so resume it after the wipe ends
if (waspaused) if (wasplaying)
S_ResumeAudio(); S_ChangeMusic(musname, flags, looping);
#endif #endif
#endif #endif
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment