Remove data/ from track name list, refactor music loading, and support loose ogg music

(these should be separate commits but they're annoying to split after
the fact, oh well)
This commit is contained in:
leo60228
2020-07-30 17:06:07 -04:00
committed by Misa Elizabeth Kai
parent 5b6c4b6b28
commit f86a67456b
3 changed files with 53 additions and 28 deletions

View File

@@ -134,9 +134,8 @@ bool binaryBlob::nextExtra(size_t* start)
for (idx = start; *idx < SDL_arraysize(m_headers); *idx += 1)
{
if (m_headers[*idx].valid
#define FOREACH_TRACK(_, track_name) && SDL_strcmp(m_headers[*idx].name, track_name) != 0
#define FOREACH_TRACK(_, track_name) && SDL_strcmp(m_headers[*idx].name, "data/" track_name) != 0
TRACK_NAMES(_)
#undef FOREACH_TRACK
) {
return true;
}