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

some small menu fixes

Browse source 
- Return in Unlock Play Modes goes to Game Options instead of the main menu
- changing some Graphics Options settings no longer plays two menu select sounds, which was really loud :(
- Return in Game Pad Options plays the menu select sound
- turning off Screen Effects plays the menu select sound
This commit is contained in:
Daniel Lee 2020-01-11 02:57:32 +00:00 committed by Ethan Lee
parent 669072f9bf
commit 03205987f7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
desktop_version/src/Input.cpp
View file

@ -428,7 +428,6 @@ SDL_assert(0 && "Remove open level dir");
if (game.currentmenuoption == 0){ if (game.currentmenuoption == 0){
music.playef(11, 10); music.playef(11, 10);
dwgfx.screenbuffer->toggleFullScreen(); dwgfx.screenbuffer->toggleFullScreen();
music.playef(11, 10);
game.fullscreen = !game.fullscreen; game.fullscreen = !game.fullscreen;
updategraphicsmode(game, dwgfx); updategraphicsmode(game, dwgfx);
game.savestats(map, dwgfx); game.savestats(map, dwgfx);
@ -437,7 +436,6 @@ SDL_assert(0 && "Remove open level dir");
}else if (game.currentmenuoption == 1){ }else if (game.currentmenuoption == 1){
music.playef(11, 10); music.playef(11, 10);
dwgfx.screenbuffer->toggleStretchMode(); dwgfx.screenbuffer->toggleStretchMode();
music.playef(11, 10);
game.stretchMode = (game.stretchMode + 1) % 3; game.stretchMode = (game.stretchMode + 1) % 3;
updategraphicsmode(game, dwgfx); updategraphicsmode(game, dwgfx);
game.savestats(map, dwgfx); game.savestats(map, dwgfx);
@ -446,7 +444,6 @@ SDL_assert(0 && "Remove open level dir");
}else if (game.currentmenuoption == 2){ }else if (game.currentmenuoption == 2){
music.playef(11, 10); music.playef(11, 10);
dwgfx.screenbuffer->toggleLinearFilter(); dwgfx.screenbuffer->toggleLinearFilter();
music.playef(11, 10);
game.useLinearFilter = !game.useLinearFilter; game.useLinearFilter = !game.useLinearFilter;
updategraphicsmode(game, dwgfx); updategraphicsmode(game, dwgfx);
game.savestats(map, dwgfx); game.savestats(map, dwgfx);
@ -709,6 +706,8 @@ SDL_assert(0 && "Remove open level dir");
music.playef(18, 10); music.playef(18, 10);
game.screenshake = 10; game.screenshake = 10;
game.flashlight = 5; game.flashlight = 5;
}else{
music.playef(11, 10);
} }
} }
else if (game.currentmenuoption == 2) else if (game.currentmenuoption == 2)
@ -1015,7 +1014,7 @@ SDL_assert(0 && "Remove open level dir");
{ {
//back //back
music.playef(11, 10); music.playef(11, 10);
game.createmenu("mainmenu"); game.createmenu("options");
map.nexttowercolour(); map.nexttowercolour();
} }
} }
@ -1332,6 +1331,7 @@ SDL_assert(0 && "Remove open level dir");
if (game.currentmenuoption == 4) if (game.currentmenuoption == 4)
{ {
music.playef(11, 10);
game.createmenu("options"); game.createmenu("options");
//Add extra menu for mmmmmm mod //Add extra menu for mmmmmm mod