Diff: main.cpp

Revision:

16:c8d68cbd1ae2

Parent:

15:d855e8c666e7

Child:

17:98127ac75195

--- a/main.cpp	Wed May 08 18:51:59 2019 +0000
+++ b/main.cpp	Thu May 09 09:58:51 2019 +0000
@@ -7,7 +7,6 @@
 Student ID Number: 201155309
 Date: 09/05/19
 */
-
 #include "mbed.h"
 #include "Gamepad.h"
 #include "N5110.h"
@@ -39,7 +38,7 @@
     while(1) {   
         //Menu Loop - Naviagates series of loops for menu screens
         if(menu.get_start_game_flag() == false) { //if start flag false stay in menu loop
-            menu.menu_loop(pad, lcd); //main menu screen - loops until user chooses next screen
+            menu.menu_loop(pad, lcd); //main menu screen - loops until user chooses next screen 
                 switch (menu.get_screen()) { //uses user choice to enter next loop in menu
                     case START:
                         menu.start_loop(pad, lcd); //loops until A pressed then game begins
@@ -53,14 +52,21 @@
                 } //when user exits sub-menu loop check game_start_flag - if false then return to main menu loop
         } else { //Game Loop - If start flag = true
             
+
             menu.reset_start_game_flag(); //resets start flag to return to menu after course complete 
             golf.init(menu.get_frame_rate()); //initialises golf objects, sets variables for game and sets frame rate
+            ticker_frame.attach(&frame_isr,1.0f/menu.get_frame_rate()); //sets up ticker used to control running speed/frame rate
             lcd.clear();
             golf.printLevel(lcd);  //Indicating start of game
             lcd.refresh();
             wait(3.0f); 
             golf.reset_game_over_flag();
-            while(golf.get_game_over_flag() == false){ //Main Game Loop
+            /* UNCOMMENT FOR TESTING
+            printf("Game Initialised\n",_level-1);
+            print("Frame Rate = %i Hz\n",menu.get_frame_rate()));
+            print("Begin Level 1 \n",menu.get_frame_rate()));
+            */
+            while(golf.get_game_over_flag() == false){ //Main Game Loop - When game is over returns to start at menu screen
             
                 if(g_frame_flag) { //If ticker calls isr and game not over
         
@@ -88,7 +94,6 @@
     lcd.init();
     pad.init();
     menu.init();
-    ticker_frame.attach(&frame_isr,1.0f/menu.get_frame_rate()); //sets up ticker used to control running speed/frame rate
     lcd.setContrast(0.55f); //can alter this in settings
     lcd.setBrightness(1.0f); //can alter this in settings