mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-10 19:09:45 +01:00
Code Issues Releases Wiki Activity

Add start of better Esc menu

Browse source 
It's not functional yet, but here are the options:

    return to game
        quit to menu
            graphic options
                game options
This commit is contained in:
Misa 2020-06-22 15:24:18 -07:00 committed by Ethan Lee
parent a402c990bf
commit 92154f4be1
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop_version/src/Input.cpp
View file

@ -1744,7 +1744,7 @@ void gameinput()
game.gamestate = MAPMODE; game.gamestate = MAPMODE;
game.gamesaved = false; game.gamesaved = false;
graphics.resumegamemode = false; graphics.resumegamemode = false;
game.menupage = 10; // The Map Page game.menupage = 30; // Pause screen
BlitSurfaceStandard(graphics.menubuffer,NULL,graphics.backBuffer, NULL); BlitSurfaceStandard(graphics.menubuffer,NULL,graphics.backBuffer, NULL);
graphics.menuoffset = 240; //actually this should count the roomname graphics.menuoffset = 240; //actually this should count the roomname
@ -1924,7 +1924,7 @@ void mapinput()
if (key.isDown(27)) if (key.isDown(27))
{ {
game.mapheld = true; game.mapheld = true;
game.menupage = 10; game.menupage = 30;
} }
} }
else else
@ -2066,6 +2066,8 @@ void mapinput()
if (game.menupage == 19) game.menupage = 21; if (game.menupage == 19) game.menupage = 21;
if (game.menupage == 22) game.menupage = 20; if (game.menupage == 22) game.menupage = 20;
if (game.menupage == 29) game.menupage = 33;
if (game.menupage == 34) game.menupage = 30;
} }
} }

21
desktop_version/src/Render.cpp
View file

@ -1685,6 +1685,27 @@ void maprender()
#undef TAB #undef TAB
} }
// Draw menu header
switch (game.menupage)
{
case 30:
case 31:
case 32:
case 33:
graphics.Print(-1, 220, "[ PAUSE ]", 196, 196, 255 - help.glow, true);
}
// Draw menu options
if (game.menupage >= 30 && game.menupage <= 33)
{
#define OPTION(opt, text) graphics.map_option(opt, 4, text, game.menupage - 30 == opt)
OPTION(0, "return to game");
OPTION(1, "quit to menu");
OPTION(2, "graphic options");
OPTION(3, "game options");
#undef OPTION
}
// Draw the actual menu // Draw the actual menu
switch(game.menupage) switch(game.menupage)
{ {