mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-27 04:41:23 +00:00
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:
commit
302358c403
2 changed files with 4 additions and 4 deletions
|
@ -550,7 +550,7 @@ boolean I_SongPlaying(void)
|
|||
#ifdef HAVE_LIBGME
|
||||
(I_SongType() == MU_GME && gme) ||
|
||||
#endif
|
||||
(boolean)music
|
||||
music != NULL
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
/// ------------------------
|
||||
|
|
Loading…
Reference in a new issue