Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
James Hale
SRB2
Commits
5cdd6a16
Commit
5cdd6a16
authored
6 years ago
by
Marco Z
Browse files
Options
Downloads
Patches
Plain Diff
Attempt to stop music before wipe (doesn't work?!)
parent
89336015
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/f_wipe.c
+9
-6
9 additions, 6 deletions
src/f_wipe.c
with
9 additions
and
6 deletions
src/f_wipe.c
+
9
−
6
View file @
5cdd6a16
...
...
@@ -342,12 +342,15 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
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
())
boolean
wasplaying
=
false
;
char
musname
[
7
];
UINT16
flags
;
boolean
looping
;
S_MusicInfo
(
musname
,
&
flags
,
&
looping
);
if
(
S_MusicPlaying
())
{
S_
PauseAudio
();
wasp
aused
=
true
;
S_
StopMusic
();
wasp
laying
=
true
;
}
#endif
...
...
@@ -392,8 +395,8 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
#ifdef _WINDOWS
// DD HACK: Music doesn't work during wipes, so resume it after the wipe ends
if
(
wasp
aused
)
S_
ResumeAudio
(
);
if
(
wasp
laying
)
S_
ChangeMusic
(
musname
,
flags
,
looping
);
#endif
#endif
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment