From cd28a95908775b340256c2c2d6479ccf70fc3c4b Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 7 Aug 2018 21:51:03 +0100 Subject: [PATCH] Fix two bugs with how I disabled midi music for Kart. * Correct the thing where it would print "music not found" when digital music is disabled. * Make the MIDI music rejection text print if MIDI music is found (and digital music is on). --- src/s_sound.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/s_sound.c b/src/s_sound.c index 44e7e7ae..846955bd 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1476,8 +1476,8 @@ static boolean S_MIDIMusic(const char *mname, boolean looping) (void)looping; - if (/*nomidimusic || */music_disabled) - return false; // didn't search. + /*if (nomidimusic || music_disabled) + return false; // didn't search.*/ if (W_CheckNumForName(va("d_%s", mname)) == LUMPERROR) return false; @@ -1537,7 +1537,7 @@ void S_ChangeMusic(const char *mmusic, UINT16 mflags, boolean looping) S_ClearSfx(); #endif - if ((nomidimusic || music_disabled) && (nodigimusic || digital_disabled)) + if (/*(nomidimusic || music_disabled) && */(nodigimusic || digital_disabled)) return; // No Music (empty string)