Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move script.hardreset() to after quit to menu

Browse Source 
This cleans up a whole lot of kludge variables, because this aggressive
hardreset() right as ACTION is pressed doesn't do anyone any favors.

This aggressive hardreset() was probably here because of the whole fact
that exiting to the menu uses Terry's State Machine, to minimize the
chances of interruption, but it actually causes more issues and allows
towers to interrupt the fadeout. And we should fix the root cause (the
usage of the state machine) instead of patching together some kludge.
This commit is contained in:
Misa
2020-05-07 14:54:39 -07:00
committed by Ethan Lee
parent 6ac41e112c
commit b59e5a8346
4 changed files with 9 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
desktop_version/src/Render.cpp
View File

@@ -2353,7 +2353,7 @@ void maprender()
if (graphics.flipmode)
{
if (game.intimetrial || game.insecretlab || game.nodeathmode || game.menukludge)
if (game.intimetrial || game.insecretlab || game.nodeathmode)
{
graphics.Print(0, 135, "Return to main menu?", 196, 196, 255 - help.glow, true);
}
@@ -2369,7 +2369,7 @@ void maprender()
else
{
if (game.intimetrial || game.insecretlab || game.nodeathmode || game.menukludge)
if (game.intimetrial || game.insecretlab || game.nodeathmode)
{
graphics.Print(0, 80, "Return to main menu?", 196, 196, 255 - help.glow, true);
}
@@ -2389,7 +2389,7 @@ void maprender()
if (graphics.flipmode)
{
if (game.intimetrial || game.insecretlab || game.nodeathmode || game.menukludge)
if (game.intimetrial || game.insecretlab || game.nodeathmode)
{
graphics.Print(0, 135, "Return to main menu?", 196, 196, 255 - help.glow, true);
}
@@ -2404,7 +2404,7 @@ void maprender()
}
else
{
if (game.intimetrial || game.insecretlab || game.nodeathmode || game.menukludge)
if (game.intimetrial || game.insecretlab || game.nodeathmode)
{
graphics.Print(0, 80, "Return to main menu?", 196, 196, 255 - help.glow, true);
}