Diff: main.cpp

Revision:

12:50a7abf21f18

Parent:

11:b288d01533cc

Child:

13:94abfe83a294

--- a/main.cpp	Tue May 07 23:01:46 2019 +0000
+++ b/main.cpp	Wed May 08 01:28:25 2019 +0000
@@ -15,8 +15,8 @@
 #include "Gamepad.h"
 #include "Donkey.h"
 #include "Options.h"
+#include "Banana.h"
 #include "Barrel.h" 
-#include "Banana.h"
 #include "GameEngine.h"
 
 N5110 lcd(PTC9,PTC0,PTC7,PTD2,PTD1,PTC11);
@@ -27,7 +27,6 @@
 GameEngine eng;
 Options opt;
 
-
 void init();
 void print_menu();
 void welcome();
@@ -87,8 +86,7 @@
     { 0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0 },
     { 0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0 },
     };
-    
-    // Controls -------------------------
+
 void controls_run();
 // Instructions ---------------------
 void instructions_run();
@@ -147,6 +145,7 @@
         if (menu_option_pos == 0) {
             // printf("GameEngine");
             eng.gameengine_run(pad, lcd, barrel, banana, dky);
+            eng.gameengine_score(pad, lcd, banana);
         }
         if (menu_option_pos == 1) {
             // printf("Controls");
@@ -167,7 +166,6 @@
     }
 }
 
-
 void print_menu() {
     lcd.clear();
     lcd.printString("Main Menu",19,0);
@@ -241,7 +239,6 @@
 // Options State-----------------------------------------------------------
 
 
-
 // High Score State--------------------------------------------------------
 void high_scores_run() {
     while (pad.check_event(Gamepad::BACK_PRESSED) == false) {