浏览代码

Fix games menu back item, titles

Scott Lahteine 4 年前
父节点
当前提交
832321f55d
共有 3 个文件被更改,包括 40 次插入27 次删除
  1. 7
    1
      Marlin/src/lcd/menu/menu_game.cpp
  2. 16
    13
      Marlin/src/lcd/menu/menu_info.cpp
  3. 17
    13
      Marlin/src/lcd/menu/menu_main.cpp

+ 7
- 1
Marlin/src/lcd/menu/menu_game.cpp 查看文件

29
 
29
 
30
 void menu_game() {
30
 void menu_game() {
31
   START_MENU();
31
   START_MENU();
32
-  BACK_ITEM(MSG_MAIN);
32
+  BACK_ITEM(
33
+    #if ENABLED(LCD_INFO_MENU)
34
+      MSG_INFO_MENU
35
+    #else
36
+      MSG_MAIN
37
+    #endif
38
+  );
33
   #if ENABLED(MARLIN_BRICKOUT)
39
   #if ENABLED(MARLIN_BRICKOUT)
34
     SUBMENU(MSG_BRICKOUT, brickout.enter_game);
40
     SUBMENU(MSG_BRICKOUT, brickout.enter_game);
35
   #endif
41
   #endif

+ 16
- 13
Marlin/src/lcd/menu/menu_info.cpp 查看文件

302
       SKIP_ITEM();
302
       SKIP_ITEM();
303
       SKIP_ITEM();
303
       SKIP_ITEM();
304
     #endif
304
     #endif
305
-    SUBMENU(MSG_GAMES, (
306
-      #if HAS_GAME_MENU
307
-        menu_game
308
-      #elif ENABLED(MARLIN_BRICKOUT)
309
-        brickout.enter_game
310
-      #elif ENABLED(MARLIN_INVADERS)
311
-        invaders.enter_game
312
-      #elif ENABLED(MARLIN_SNAKE)
313
-        snake.enter_game
314
-      #elif ENABLED(MARLIN_MAZE)
315
-        maze.enter_game
316
-      #endif
317
-    ));
305
+    // Game sub-menu or the individual game
306
+    {
307
+      SUBMENU(
308
+        #if HAS_GAME_MENU
309
+          MSG_GAMES, menu_game
310
+        #elif ENABLED(MARLIN_BRICKOUT)
311
+          MSG_BRICKOUT, brickout.enter_game
312
+        #elif ENABLED(MARLIN_INVADERS)
313
+          MSG_INVADERS, invaders.enter_game
314
+        #elif ENABLED(MARLIN_SNAKE)
315
+          MSG_SNAKE, snake.enter_game
316
+        #elif ENABLED(MARLIN_MAZE)
317
+          MSG_MAZE, maze.enter_game
318
+        #endif
319
+      );
320
+    }
318
   #endif
321
   #endif
319
 
322
 
320
   END_MENU();
323
   END_MENU();

+ 17
- 13
Marlin/src/lcd/menu/menu_main.cpp 查看文件

271
     #if ENABLED(GAMES_EASTER_EGG)
271
     #if ENABLED(GAMES_EASTER_EGG)
272
       SKIP_ITEM();
272
       SKIP_ITEM();
273
       SKIP_ITEM();
273
       SKIP_ITEM();
274
+      SKIP_ITEM();
274
     #endif
275
     #endif
275
-    SUBMENU(MSG_GAMES, (
276
-      #if HAS_GAME_MENU
277
-        menu_game
278
-      #elif ENABLED(MARLIN_BRICKOUT)
279
-        brickout.enter_game
280
-      #elif ENABLED(MARLIN_INVADERS)
281
-        invaders.enter_game
282
-      #elif ENABLED(MARLIN_SNAKE)
283
-        snake.enter_game
284
-      #elif ENABLED(MARLIN_MAZE)
285
-        maze.enter_game
286
-      #endif
287
-    ));
276
+    // Game sub-menu or the individual game
277
+    {
278
+      SUBMENU(
279
+        #if HAS_GAME_MENU
280
+          MSG_GAMES, menu_game
281
+        #elif ENABLED(MARLIN_BRICKOUT)
282
+          MSG_BRICKOUT, brickout.enter_game
283
+        #elif ENABLED(MARLIN_INVADERS)
284
+          MSG_INVADERS, invaders.enter_game
285
+        #elif ENABLED(MARLIN_SNAKE)
286
+          MSG_SNAKE, snake.enter_game
287
+        #elif ENABLED(MARLIN_MAZE)
288
+          MSG_MAZE, maze.enter_game
289
+        #endif
290
+      );
291
+    }
288
   #endif
292
   #endif
289
 
293
 
290
   END_MENU();
294
   END_MENU();

正在加载...
取消
保存