mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2026-02-06 00:51:16 +03:00
Remove fademode conditional from map screen
There's not really any good reason to prevent this action during a fade animation. That just makes the fade timer one more potential contributor to a softlock. I'm leaving the fademode conditional on the Time Trial quick restart, though - removing it would mean being able to quick restart during a fade-in, and thus being able to spam Enter over and over to keep re-starting the fade animation, which looks goofy.
This commit is contained in:
@@ -2018,7 +2018,7 @@ void gameinput()
|
|||||||
graphics.oldmenuoffset -= 10;
|
graphics.oldmenuoffset -= 10;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (game.intimetrial && graphics.fademode==0)
|
else if (game.intimetrial && graphics.fademode == 0)
|
||||||
{
|
{
|
||||||
//Quick restart of time trial
|
//Quick restart of time trial
|
||||||
graphics.fademode = 2;
|
graphics.fademode = 2;
|
||||||
@@ -2026,7 +2026,11 @@ void gameinput()
|
|||||||
music.fadeout();
|
music.fadeout();
|
||||||
game.quickrestartkludge = true;
|
game.quickrestartkludge = true;
|
||||||
}
|
}
|
||||||
else if (graphics.fademode==0)
|
else if (game.intimetrial)
|
||||||
|
{
|
||||||
|
//Do nothing if we're in a Time Trial but a fade animation is playing
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
//Normal map screen, do transition later
|
//Normal map screen, do transition later
|
||||||
game.gamestate = MAPMODE;
|
game.gamestate = MAPMODE;
|
||||||
|
|||||||
Reference in New Issue
Block a user