Diff: main.cpp

Revision:

5:93a4c396c1af

Parent:

4:cdc54191ff07

--- a/main.cpp	Tue May 22 19:13:03 2018 +0000
+++ b/main.cpp	Sat Oct 26 15:44:26 2019 +0000
@@ -5,7 +5,7 @@
 #include "graphics.h"
 #include "speech.h"
 #include "startmenu.h"
-#include "ingamemenu.h"
+#include "pausemenu.h"
 #include "gameover.h"
 
 // Functions in this file
@@ -309,7 +309,10 @@
             }
             break;
         case MENU_BUTTON:
-            switch_axis = ingamemenu(&p1);
+            PauseMenu pause_m(&p1);
+            pause_m.display();
+            switch_axis = pause_m.get_config();
+            //switch_axis = ingamemenu(&p1);
             
         break;
         default: break;
@@ -500,8 +503,9 @@
  */
 int main()
 {
-    Menu start_m = Menu(3);   
-    int start = start_m.display();
+    
+    StartMenu start_m = StartMenu();   
+    int st = start_m.display();
     // First things first: initialize hardware
     ASSERT_P(hardware_init() == ERROR_NONE, "Hardware init failed!");