Diff: Menu/Menu.h

Revision:

5:0b31909caf7f

Parent:

4:035448357749

Child:

12:7f7fadb5c106

--- a/Menu/Menu.h	Mon Apr 08 15:10:28 2019 +0000
+++ b/Menu/Menu.h	Wed Apr 17 10:27:09 2019 +0000
@@ -5,7 +5,6 @@
 #include "N5110.h"
 #include "Gamepad.h"
 
-
 /** Menu Class
 * @brief Library for navigating menu options
 * @author Ellis Blackford Stroud
@@ -28,16 +27,16 @@
     void print_welcome(N5110 &lcd);
     
     /** Prints menu screen */
-    void print_menu(N5110 &lcd);
+    void menu_screen(Gamepad &pad, N5110 &lcd);
     
     /** Prints start screen */
-    bool check_start(N5110 &lcd, Gamepad &pad);
+    bool start_screen(N5110 &lcd, Gamepad &pad);
     
      /** Prints highscore screen */
-    void print_highscores(N5110 &lcd, Gamepad &pad);
+    void highscores_screen(N5110 &lcd, Gamepad &pad);
     
      /** Prints settings screen */
-    void print_settings(N5110 &lcd, Gamepad &pad);
+    void settings_screen(N5110 &lcd, Gamepad &pad);
     
     void draw_settings(N5110 &lcd, Gamepad &pad);
     
@@ -45,14 +44,11 @@
     * @returns a bool: true to start game, false to stay in menu
     */
     bool menu_change(N5110 &lcd, Gamepad &pad);
-    
-    /** Returns to menu screen */
-    void menu_return(N5110 &lcd, Gamepad &pad);
 
     /** Updates cursor and returns menu choice
     * @returns an enum: START, HIGHSCORES, SETTINGS
     */
-    void menu_select(Gamepad &pad, N5110 &lcd);    
+    void cursor_select(Gamepad &pad, N5110 &lcd);    
     
     void set_frame_rate(int frame_rate);
     
@@ -85,8 +81,6 @@
     int _frame_rate;
     
     Direction _joy_direction;
-    
-    
 
 };