Diff: main.cpp

Revision:

40:3a0c66a0e10e

Parent:

39:f92b93efbc72

Child:

41:1b396334256b

--- a/main.cpp	Tue Apr 25 22:26:14 2017 +0000
+++ b/main.cpp	Sat Apr 29 19:27:20 2017 +0000
@@ -32,17 +32,22 @@
 int main()
 {
     init();
-    gameMenu();
-    setTicker = 1; //set the ticker.
+    game.gameMenu_flag = 1;
     while (true) {
-        if (setTicker == 1) {  
+        if (game.gameMenu_flag == 1) {
+            gameMenu();
+            setTicker = 1; //set the ticker.
+            game.gameMenu_flag = 0; //remove flag
+        }
+        if (setTicker == 1 || game.retry_flag == 1) {  
+            game.retry_flag = 0; //clear flag
             startGame();
         }
         
         //this is the game
         game.update(pad, lcd); 
         
-        while(waveComplete_flag == 1) { //after every wave, go to upgrades
+        while (waveComplete_flag == 1) { //after every wave, go to upgrades
             gameUpgrades();
         }
         render();
@@ -68,6 +73,7 @@
     render();
     wait(2.0);
     game.init(waveNumber);
+    game.update_RetryToMain(); //bring back the previous game state
     waveCompleteTicker.attach(&waveComplete_isr,60); //60 seconds for a wave.
     setTicker = 0; //clear set ticker flag
 }
@@ -82,7 +88,7 @@
         waveComplete_flag = 0; //get out of while loop
         setTicker = 1; //continue the game
         game.doneUpgrade_flag = 0;
-        printf("i got out");
+        //printf("i got out");
     }
 }
 void waveComplete_isr() {