mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-22 16:59:46 +01:00
Code Issues Releases Wiki Activity

Account for extra tracks in musicclass::play()

Browse source 
Since each soundtrack is no longer guaranteed to be 16, we'll have to
account for their different lengths when playing music.
This commit is contained in:
Misa 2020-06-30 17:08:37 -07:00 committed by Ethan Lee
parent 08fe655a5f
commit 7c2b418761
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
desktop_version/src/Music.cpp
View file

@ -57,6 +57,9 @@ void musicclass::init()
musicWriteBlob.writeBinaryBlob("data/BinaryMusic.vvv"); musicWriteBlob.writeBinaryBlob("data/BinaryMusic.vvv");
#endif #endif
num_mmmmmm_tracks = 0;
num_pppppp_tracks = 0;
if (!musicReadBlob.unPackBinary("mmmmmm.vvv")) if (!musicReadBlob.unPackBinary("mmmmmm.vvv"))
{ {
mmmmmm = false; mmmmmm = false;
@ -78,12 +81,16 @@ void musicclass::init()
TRACK_NAMES TRACK_NAMES
num_mmmmmm_tracks += 16;
const std::vector<int> extra = musicReadBlob.getExtra(); const std::vector<int> extra = musicReadBlob.getExtra();
for (size_t i = 0; i < extra.size(); i++) for (size_t i = 0; i < extra.size(); i++)
{ {
const int& index = extra[i]; const int& index = extra[i];
rw = SDL_RWFromMem(musicReadBlob.getAddress(index), musicReadBlob.getSize(index)); rw = SDL_RWFromMem(musicReadBlob.getAddress(index), musicReadBlob.getSize(index));
musicTracks.push_back(MusicTrack( rw )); musicTracks.push_back(MusicTrack( rw ));
num_mmmmmm_tracks++;
} }
bool ohCrap = musicReadBlob.unPackBinary("vvvvvvmusic.vvv"); bool ohCrap = musicReadBlob.unPackBinary("vvvvvvmusic.vvv");
@ -97,12 +104,16 @@ void musicclass::init()
#undef FOREACH_TRACK #undef FOREACH_TRACK
num_pppppp_tracks += 16;
const std::vector<int> extra = musicReadBlob.getExtra(); const std::vector<int> extra = musicReadBlob.getExtra();
for (size_t i = 0; i < extra.size(); i++) for (size_t i = 0; i < extra.size(); i++)
{ {
const int& index = extra[i]; const int& index = extra[i];
rw = SDL_RWFromMem(musicReadBlob.getAddress(index), musicReadBlob.getSize(index)); rw = SDL_RWFromMem(musicReadBlob.getAddress(index), musicReadBlob.getSize(index));
musicTracks.push_back(MusicTrack( rw )); musicTracks.push_back(MusicTrack( rw ));
num_pppppp_tracks++;
} }
safeToProcessMusic= false; safeToProcessMusic= false;
@ -131,14 +142,19 @@ void songend()
void musicclass::play(int t, const double position_sec /*= 0.0*/, const int fadein_ms /*= 3000*/) void musicclass::play(int t, const double position_sec /*= 0.0*/, const int fadein_ms /*= 3000*/)
{ {
t = (t % 16); // No need to check if num_tracks is greater than 0, we wouldn't be here if it wasn't
if (mmmmmm && usingmmmmmm)
if(mmmmmm)
{ {
if(!usingmmmmmm) t %= num_mmmmmm_tracks;
{
t += 16;
} }
else
{
t %= num_pppppp_tracks;
}
if(mmmmmm && !usingmmmmmm)
{
t += num_mmmmmm_tracks;
} }
safeToProcessMusic = true; safeToProcessMusic = true;
Mix_VolumeMusic(128); Mix_VolumeMusic(128);
@ -147,7 +163,7 @@ void musicclass::play(int t, const double position_sec /*= 0.0*/, const int fade
if (t != -1) if (t != -1)
{ {
currentsong = t; currentsong = t;
if (currentsong == 0 || currentsong == 7 || (!map.custommode && (currentsong == 16 || currentsong == 23))) if (currentsong == 0 || currentsong == 7 || (!map.custommode && (currentsong == 0+num_pppppp_tracks || currentsong == 7+num_pppppp_tracks)))
{ {
// Level Complete theme, no fade in or repeat // Level Complete theme, no fade in or repeat
if(Mix_FadeInMusicPos(musicTracks[t].m_music, 0, 0, position_sec)==-1) if(Mix_FadeInMusicPos(musicTracks[t].m_music, 0, 0, position_sec)==-1)

2
desktop_version/src/Music.h
View file

@ -51,6 +51,8 @@ public:
bool usingmmmmmm; bool usingmmmmmm;
binaryBlob musicReadBlob; binaryBlob musicReadBlob;
int num_pppppp_tracks;
int num_mmmmmm_tracks;
Uint64 songStart; Uint64 songStart;
Uint64 songEnd; Uint64 songEnd;