mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2026-01-30 01:48:15 +03:00
Prevent user-initiated map menu changes during menu animations
This makes it so it's not even possible to stay on the TELEPORTERMODE screen by opening the map while it's being brought down. It also makes it so the map animation is able to be canceled when being brought up just by opening the map and closing it. Fixes #833.
This commit is contained in:
@@ -6857,8 +6857,15 @@ void Game::unlockAchievement(const char *name) {
|
||||
#endif
|
||||
}
|
||||
|
||||
void Game::mapmenuchange(const int newgamestate)
|
||||
void Game::mapmenuchange(const int newgamestate, const bool user_initiated)
|
||||
{
|
||||
if (user_initiated
|
||||
&& graphics.menuoffset > 0
|
||||
&& graphics.menuoffset < (map.extrarow ? 230 : 240))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
prevgamestate = gamestate;
|
||||
gamestate = newgamestate;
|
||||
graphics.resumegamemode = false;
|
||||
|
||||
Reference in New Issue
Block a user