vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

mixer_sound fix x64 build issue

See merge request STJr/SRB2!323
This commit is contained in:
Monster Iestyn 2018-11-13 17:42:23 -05:00
parent 41b4ffd458 2db2b6e6af
commit 302358c403
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sdl/mixer_sound.c
View File

@ -550,7 +550,7 @@ boolean I_SongPlaying(void)
#ifdef HAVE_LIBGME
(I_SongType() == MU_GME && gme) ||
#endif
(boolean)music
music != NULL
);
}

6
src/win32/win_snd.c
View File

@ -492,15 +492,15 @@ musictype_t I_SongType(void)
boolean I_SongPlaying(void)
{
return (boolean)music_stream;
return (music_stream != NULL);
}
boolean I_SongPaused(void)
{
boolean fmpaused = false;
FMOD_BOOL fmpaused = false;
if (music_stream)
FMOD_Channel_GetPaused(music_channel, &fmpaused);
return fmpaused;
return (boolean)fmpaused;
}
/// ------------------------