MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix games menu back item, titles

Browse Source
This commit is contained in:
Scott Lahteine 2019-12-31 16:06:16 -06:00
parent 941a09b6ac
commit 832321f55d
3 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/lcd/menu/menu_game.cpp
View File

@ -29,7 +29,13 @@
void menu_game() {
START_MENU();
BACK_ITEM(MSG_MAIN);
BACK_ITEM(
#if ENABLED(LCD_INFO_MENU)
MSG_INFO_MENU
#else
MSG_MAIN
#endif
);
#if ENABLED(MARLIN_BRICKOUT)
SUBMENU(MSG_BRICKOUT, brickout.enter_game);
#endif

29
Marlin/src/lcd/menu/menu_info.cpp
View File

@ -302,19 +302,22 @@ void menu_info() {
SKIP_ITEM();
SKIP_ITEM();
#endif
SUBMENU(MSG_GAMES, (
#if HAS_GAME_MENU
menu_game
#elif ENABLED(MARLIN_BRICKOUT)
brickout.enter_game
#elif ENABLED(MARLIN_INVADERS)
invaders.enter_game
#elif ENABLED(MARLIN_SNAKE)
snake.enter_game
#elif ENABLED(MARLIN_MAZE)
maze.enter_game
#endif
));
// Game sub-menu or the individual game
{
SUBMENU(
#if HAS_GAME_MENU
MSG_GAMES, menu_game
#elif ENABLED(MARLIN_BRICKOUT)
MSG_BRICKOUT, brickout.enter_game
#elif ENABLED(MARLIN_INVADERS)
MSG_INVADERS, invaders.enter_game
#elif ENABLED(MARLIN_SNAKE)
MSG_SNAKE, snake.enter_game
#elif ENABLED(MARLIN_MAZE)
MSG_MAZE, maze.enter_game
#endif
);
}
#endif
END_MENU();

30
Marlin/src/lcd/menu/menu_main.cpp
View File

@ -271,20 +271,24 @@ void menu_main() {
#if ENABLED(GAMES_EASTER_EGG)
SKIP_ITEM();
SKIP_ITEM();
SKIP_ITEM();
#endif
SUBMENU(MSG_GAMES, (
#if HAS_GAME_MENU
menu_game
#elif ENABLED(MARLIN_BRICKOUT)
brickout.enter_game
#elif ENABLED(MARLIN_INVADERS)
invaders.enter_game
#elif ENABLED(MARLIN_SNAKE)
snake.enter_game
#elif ENABLED(MARLIN_MAZE)
maze.enter_game
#endif
));
// Game sub-menu or the individual game
{
SUBMENU(
#if HAS_GAME_MENU
MSG_GAMES, menu_game
#elif ENABLED(MARLIN_BRICKOUT)
MSG_BRICKOUT, brickout.enter_game
#elif ENABLED(MARLIN_INVADERS)
MSG_INVADERS, invaders.enter_game
#elif ENABLED(MARLIN_SNAKE)
MSG_SNAKE, snake.enter_game
#elif ENABLED(MARLIN_MAZE)
MSG_MAZE, maze.enter_game
#endif
);
}
#endif
END_MENU();