mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2025-01-08 18:09:45 +01: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:
parent
fd19b4e5d8
commit
69337009b8
1 changed files with 6 additions and 2 deletions
|
@ -2018,7 +2018,7 @@ void gameinput()
|
|||
graphics.oldmenuoffset -= 10;
|
||||
}
|
||||
}
|
||||
else if (game.intimetrial && graphics.fademode==0)
|
||||
else if (game.intimetrial && graphics.fademode == 0)
|
||||
{
|
||||
//Quick restart of time trial
|
||||
graphics.fademode = 2;
|
||||
|
@ -2026,7 +2026,11 @@ void gameinput()
|
|||
music.fadeout();
|
||||
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
|
||||
game.gamestate = MAPMODE;
|
||||
|
|
Loading…
Reference in a new issue