From 366aeadac41b6f3a6c079c485ef396aa7e381f4b Mon Sep 17 00:00:00 2001 From: mazmazz Date: Tue, 13 Nov 2018 17:12:18 -0500 Subject: [PATCH 1/2] Fix x64 build issue --- src/sdl/mixer_sound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index 52a351622..609d7dec6 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -550,7 +550,7 @@ boolean I_SongPlaying(void) #ifdef HAVE_LIBGME (I_SongType() == MU_GME && gme) || #endif - (boolean)music + music != NULL ); } From 86f48304ba4e9a631429630c96054a6488834108 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Tue, 13 Nov 2018 17:24:19 -0500 Subject: [PATCH 2/2] Win32 boolean fixes --- src/win32/win_snd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c index 1e1b062f8..f2af7f928 100644 --- a/src/win32/win_snd.c +++ b/src/win32/win_snd.c @@ -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; } /// ------------------------