mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

De-duplicate "You have unlocked" menu input and options

Browse source 
They all have the same input handling and menu options, so condense them
into one block instead of duplicating the same block of code multiple
times.
This commit is contained in:
Misa 2020-04-15 12:16:53 -07:00 committed by Ethan Lee
parent 119d2ad25f
commit 1e3879b8fe
2 changed files with 10 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
desktop_version/src/Game.cpp
View file

@ -6955,25 +6955,11 @@ void Game::createmenu( std::string t )
}
}
}
else if (t == "unlocktimetrial" || t == "unlocktimetrials")
{
option("continue");
menuxoff = 20;
menuyoff = 70;
}
else if (t == "unlocknodeathmode")
{
option("continue");
menuxoff = 20;
menuyoff = 70;
}
else if (t == "unlockintermission")
{
option("continue");
menuxoff = 20;
menuyoff = 70;
}
else if (t == "unlockflipmode")
else if (t == "unlocktimetrial"
|| t == "unlocktimetrials"
|| t == "unlocknodeathmode"
|| t == "unlockintermission"
|| t == "unlockflipmode")
{
option("continue");
menuxoff = 20;

14
desktop_version/src/Input.cpp
View file

@ -1343,15 +1343,11 @@ void menuactionpress()
game.createmenu("mainmenu");
map.nexttowercolour();
}
else if (game.currentmenuname == "unlocktimetrials" || game.currentmenuname == "unlocktimetrial")
{
//back
music.playef(11);
game.createmenu("play");
map.nexttowercolour();
}
else if (game.currentmenuname == "unlocknodeathmode" || game.currentmenuname == "unlockintermission"
|| game.currentmenuname == "unlockflipmode")
else if (game.currentmenuname == "unlocktimetrials"
|| game.currentmenuname == "unlocktimetrial"
|| game.currentmenuname == "unlocknodeathmode"
|| game.currentmenuname == "unlockintermission"
|| game.currentmenuname == "unlockflipmode")
{
//back
music.playef(11);