JianWei Lee / Mbed 2 deprecated project_game

Meteor defense project

Dependencies:   N5110 mbed

Diff: main.cpp

Revision:
29:6632dd9c48d8
Parent:
28:450ab72fabdc
Child:
30:2e2d48cbfec3
--- a/main.cpp	Mon Apr 17 18:22:16 2017 +0000
+++ b/main.cpp	Tue Apr 18 11:21:35 2017 +0000
@@ -15,7 +15,7 @@
 
 
 
-int gamefps = 3;
+int gamefps = 15;
 
 Ticker waveCompleteTicker; 
 int setTicker;
@@ -39,10 +39,13 @@
             lcd.printString(wave,10,3);
             render();
             wait(2.0);
-            waveCompleteTicker.attach(&waveComplete_isr,2);
+            game.init();
+            waveCompleteTicker.attach(&waveComplete_isr,60);
             setTicker = 0; //clear set ticker flag
         }
-        //game.update(pad, lcd); //this is the game
+        
+        game.update(pad, lcd); //this is the game
+        
         while(waveComplete_flag == 1) {
             waveCompleteTicker.detach();
             lcd.printString("60 seconds",10,3);