mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2025-01-29 20:50:38 +00:00
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).
This commit is contained in:
parent
c52a4de933
commit
cd28a95908
1 changed files with 3 additions and 3 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue