1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00

Remove reliance on fademode to return to menu

This was used by the old system, which also had an over-reliance on
Terry's State Machine. And due to the fact that it relied on fademode,
it also meant that bringing up the pause screen while faded-out would
result in the player getting sent back to the menu, so one accidental
Esc press during a cutscene could mean countless hours of progress lost
(especially in custom levels).
This commit is contained in:
Misa 2020-05-07 15:47:12 -07:00 committed by Ethan Lee
parent 656680b49c
commit 3235b64d19

View file

@ -1900,24 +1900,6 @@ void mapinput()
}
}
if (graphics.fademode == 1)
{
FillRect(graphics.menubuffer, 0x000000);
graphics.resumegamemode = true;
obj.removeallblocks();
game.activeactivity = -1;
if (game.menupage >= 20)
{
game.state = 96;
game.statedelay = 0;
}
else
{
game.state = 80;
game.statedelay = 0;
}
}
if (!game.jumpheld)
{
if (game.press_action || game.press_left || game.press_right || game.press_map)