From 08fe655a5f10578f44b3776e852bf24028bed3c5 Mon Sep 17 00:00:00 2001 From: Misa Date: Tue, 30 Jun 2020 15:35:50 -0700 Subject: [PATCH] Parse extra headers from binary blob Not just the ones that contain specific names. --- desktop_version/src/Music.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp index 3a57a787..e96508bb 100644 --- a/desktop_version/src/Music.cpp +++ b/desktop_version/src/Music.cpp @@ -78,6 +78,14 @@ void musicclass::init() TRACK_NAMES + const std::vector extra = musicReadBlob.getExtra(); + for (size_t i = 0; i < extra.size(); i++) + { + const int& index = extra[i]; + rw = SDL_RWFromMem(musicReadBlob.getAddress(index), musicReadBlob.getSize(index)); + musicTracks.push_back(MusicTrack( rw )); + } + bool ohCrap = musicReadBlob.unPackBinary("vvvvvvmusic.vvv"); SDL_assert(ohCrap && "Music not found!"); } @@ -89,6 +97,14 @@ void musicclass::init() #undef FOREACH_TRACK + const std::vector extra = musicReadBlob.getExtra(); + for (size_t i = 0; i < extra.size(); i++) + { + const int& index = extra[i]; + rw = SDL_RWFromMem(musicReadBlob.getAddress(index), musicReadBlob.getSize(index)); + musicTracks.push_back(MusicTrack( rw )); + } + safeToProcessMusic= false; m_doFadeInVol = false; musicVolume = 128;