Skip to content
Snippets Groups Projects
Commit 302358c4 authored by Monster Iestyn's avatar Monster Iestyn
Browse files

Merge branch 'mixer-sound-x64-fix' into 'master'

mixer_sound fix x64 build issue

See merge request STJr/SRB2!323
parents 41b4ffd4 2db2b6e6
No related branches found
No related tags found
2 merge requests!488Merge in next and don't billboard papersprites in GL,!323mixer_sound fix x64 build issue
...@@ -550,7 +550,7 @@ boolean I_SongPlaying(void) ...@@ -550,7 +550,7 @@ boolean I_SongPlaying(void)
#ifdef HAVE_LIBGME #ifdef HAVE_LIBGME
(I_SongType() == MU_GME && gme) || (I_SongType() == MU_GME && gme) ||
#endif #endif
(boolean)music music != NULL
); );
} }
......
...@@ -492,15 +492,15 @@ musictype_t I_SongType(void) ...@@ -492,15 +492,15 @@ musictype_t I_SongType(void)
boolean I_SongPlaying(void) boolean I_SongPlaying(void)
{ {
return (boolean)music_stream; return (music_stream != NULL);
} }
boolean I_SongPaused(void) boolean I_SongPaused(void)
{ {
boolean fmpaused = false; FMOD_BOOL fmpaused = false;
if (music_stream) if (music_stream)
FMOD_Channel_GetPaused(music_channel, &fmpaused); FMOD_Channel_GetPaused(music_channel, &fmpaused);
return fmpaused; return (boolean)fmpaused;
} }
/// ------------------------ /// ------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment