mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-11-05 02:39:41 +01:00
Merge pull request #641 from InfoTeddy/general-improvements
Add previous song option to editor music screen
This commit is contained in:
commit
1dd4634298
2 changed files with 13 additions and 3 deletions
|
@ -6417,6 +6417,7 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
|
|||
break;
|
||||
case Menu::ed_music:
|
||||
option("next song");
|
||||
option("previous song");
|
||||
option("back");
|
||||
menuyoff = 16;
|
||||
maxspacing = 15;
|
||||
|
|
|
@ -3726,8 +3726,17 @@ static void editormenuactionpress()
|
|||
switch (game.currentmenuoption)
|
||||
{
|
||||
case 0:
|
||||
ed.levmusic++;
|
||||
if(ed.levmusic==16) ed.levmusic=0;
|
||||
case 1:
|
||||
switch (game.currentmenuoption)
|
||||
{
|
||||
case 0:
|
||||
ed.levmusic++;
|
||||
break;
|
||||
case 1:
|
||||
ed.levmusic--;
|
||||
break;
|
||||
}
|
||||
ed.levmusic = (ed.levmusic % 16 + 16) % 16;
|
||||
if(ed.levmusic>0)
|
||||
{
|
||||
music.play(ed.levmusic);
|
||||
|
@ -3738,7 +3747,7 @@ static void editormenuactionpress()
|
|||
}
|
||||
music.playef(11);
|
||||
break;
|
||||
case 1:
|
||||
case 2:
|
||||
music.playef(11);
|
||||
music.fadeout();
|
||||
game.returnmenu();
|
||||
|
|
Loading…
Reference in a new issue