thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 13:01:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't let a missing music lump cause an I_Error()

Browse source 
Fix midi lump checking being broken
This commit is contained in:
SteelT 2020-08-18 15:10:56 -04:00
parent 296e974e9d
commit ba15c7caf3
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/s_sound.c
View file

@ -2335,12 +2335,12 @@ static lumpnum_t S_GetMusicLumpNum(const char *mname)
return W_GetNumForName(va(midipref ? "d_%s":"o_%s", mname)); return W_GetNumForName(va(midipref ? "d_%s":"o_%s", mname));
else if (S_PrefAvailable(!midipref, mname)) else if (S_PrefAvailable(!midipref, mname))
return W_GetNumForName(va(midipref ? "o_%s":"d_%s", mname)); return W_GetNumForName(va(midipref ? "o_%s":"d_%s", mname));
#else
if (S_DigExists(mname))
return W_GetNumForName(va("o_%s", mname));
#endif
else else
return LUMPERROR; return LUMPERROR;
#else
return W_GetNumForName(va("o_%s", mname));
#endif
} }
static boolean S_LoadMusic(const char *mname) static boolean S_LoadMusic(const char *mname)
@ -2353,15 +2353,14 @@ static boolean S_LoadMusic(const char *mname)
mlumpnum = S_GetMusicLumpNum(mname); mlumpnum = S_GetMusicLumpNum(mname);
if (S_MIDIMusicDisabled() && S_MIDIExists(mname)) if (!S_DigExists(mname) && S_MIDIExists(mname))
{ {
#ifdef NO_MIDI #ifdef NO_MIDI
CONS_Alert(CONS_ERROR, "A MIDI music lump %.6s was found,\nbut SRB2Kart does not support MIDI output.\nWe apologise for the inconvenience.\n", mname); CONS_Alert(CONS_ERROR, "A MIDI music lump %.6s was found,\nbut SRB2Kart does not support MIDI output.\nWe apologise for the inconvenience.\n", mname);
#endif
return false; return false;
#endif
} }
else if (mlumpnum == LUMPERROR)
if (mlumpnum == LUMPERROR)
{ {
CONS_Alert(CONS_ERROR, "Music %.6s could not be loaded: lump not found!\n", mname); CONS_Alert(CONS_ERROR, "Music %.6s could not be loaded: lump not found!\n", mname);
return false; return false;