mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

Fix silent music saves playing MMMMMM track 15 if...

Browse source 
This commit fixes a bug that's existed since MMMMMM was added (so, 2.2),
where if you quicksaved in a custom level while no music was playing,
then quit and loaded that quicksave, and you were using PPPPPP while
having MMMMMM available, it would play MMMMMM track 15, even though the
game intends for the music to simply be silent.

This is due to the same bug that lets you play MMMMMM tracks if you're
on PPPPPP - musicclass::play() does a modulo, but C++ modulo is not
guaranteed to be positive given negative inputs, so the 16-track offset
is added to a negative number, resulting in targeting the MMMMMM
soundtrack instead of PPPPPP.

That exploit doesn't harm anyone and shouldn't be fixed, EXCEPT it
causes a problem in this specific case. But this bug can be fixed
without removing that exploit.

Note that I made the check do not-equal to -1 instead of greater-than
-1, so levels that intend on using track -2, -3, -4, etc. upon loading a
quicksave will still work as their creator intended. It's just that
specifically -1 is patched out, just to fix this issue.
This commit is contained in:
Misa 2020-08-06 18:36:35 -07:00 committed by Ethan Lee
parent 79fd3e1d36
commit 2710ebeff9
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
desktop_version/src/Game.cpp
View file

@ -5166,7 +5166,11 @@ void Game::loadquick()
}
else if (pKey == "currentsong")
{
music.play(atoi(pText));
int song = atoi(pText);
if (song != -1)
{
music.play(song);
}
}
}
@ -5365,7 +5369,11 @@ void Game::customloadquick(std::string savfile)
}
else if (pKey == "currentsong")
{
music.play(atoi(pText));
int song = atoi(pText);
if (song != -1)
{
music.play(song);
}
}
else if (pKey == "showminimap")
{
@ -6315,7 +6323,11 @@ void Game::loadtele()
}
else if (pKey == "currentsong")
{
music.play(atoi(pText));
int song = atoi(pText);
if (song != -1)
{
music.play(song);
}
}
}