mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-23 01:59:43 +01:00
Smoothly interpolate "[Press ENTER to return to editor]" fadeout
Now it'll be real smooth at 60 FPS. Or above. Or whichever one you want above 30.
This commit is contained in:
parent
5daad95f1d
commit
9256b4da56
4 changed files with 6 additions and 1 deletions
|
@ -1666,6 +1666,7 @@ void gamelogic()
|
|||
}
|
||||
|
||||
#if !defined(NO_CUSTOM_LEVELS)
|
||||
ed.oldreturneditoralpha = ed.returneditoralpha;
|
||||
if (map.custommode && !map.custommodeforreal && ed.returneditoralpha > 0)
|
||||
{
|
||||
ed.returneditoralpha -= 15;
|
||||
|
|
|
@ -1389,7 +1389,8 @@ void gamerender()
|
|||
#if !defined(NO_CUSTOM_LEVELS)
|
||||
if(map.custommode && !map.custommodeforreal && !game.advancetext){
|
||||
//Return to level editor
|
||||
graphics.bprintalpha(5, 5, "[Press ENTER to return to editor]", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), ed.returneditoralpha, false);
|
||||
int alpha = graphics.lerp(ed.oldreturneditoralpha, ed.returneditoralpha);
|
||||
graphics.bprintalpha(5, 5, "[Press ENTER to return to editor]", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), alpha, false);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -407,6 +407,7 @@ void editorclass::reset()
|
|||
script.customscripts.clear();
|
||||
|
||||
returneditoralpha = 0;
|
||||
oldreturneditoralpha = 0;
|
||||
|
||||
ghosts.clear();
|
||||
currentghosts = 0;
|
||||
|
@ -4636,6 +4637,7 @@ void editorinput()
|
|||
music.haltdasmusik();
|
||||
graphics.backgrounddrawn=false;
|
||||
ed.returneditoralpha = 1000; // Let's start it higher than 255 since it gets clamped
|
||||
ed.oldreturneditoralpha = 1000;
|
||||
script.startgamemode(21);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -237,6 +237,7 @@ class editorclass{
|
|||
int dmtileeditor;
|
||||
|
||||
int returneditoralpha;
|
||||
int oldreturneditoralpha;
|
||||
|
||||
std::vector<GhostInfo> ghosts;
|
||||
int currentghosts;
|
||||
|
|
Loading…
Reference in a new issue