Diff: main.cpp

Revision:

3:e67f9ba37049

Parent:

2:c3d86dd51b69

Child:

5:b6fcee26c5ff

--- a/main.cpp	Wed Apr 12 23:47:49 2017 +0000
+++ b/main.cpp	Fri Apr 14 22:30:16 2017 +0000
@@ -12,50 +12,30 @@
 Operator Opp; 
 int button_val;
 int instruction_val;
-int score;
 void starter();
 
 int main() {
     button_val=0;
-    score = 0;
     lcd.init();  
     Opp.init();
     display.init(); 
     pad.init(); 
     starter(); 
-    while(1) {
-    instruction_val = Opp.random_instruction(display, lcd);
-    display.drawCircle(lcd); 
-    button_val = Opp.read_input(pad); 
-    pad.leds_off();  
-    if (button_val == instruction_val) {
-        score++;
-        pad.led(1,1); 
-        pad.led(2,1); 
-        pad.led(3,1); 
-        pad.tone(100.0,0.2);  
-        char buffer[14];
-        sprintf(buffer,"Button = %2d",button_val);
-        lcd.printString(buffer,0,1);
-        lcd.refresh();
-        } else {
-        pad.tone(700.0,1);
-        while(pad.check_event(Controller::BACK_PRESSED) == false) { 
-        char buffer[14];
-        sprintf(buffer,"Score = %2d",score);
-        lcd.printString(buffer,0,1);
-        lcd.refresh(); 
-        pad.leds_off();
-        pad.led(4,1); 
-        pad.led(5,1); 
-        pad.led(6,1);   
-    } 
-        score = 0; 
-        display.init();
-        pad.init();
-        starter(); }
-        wait(0.2);
+        while(1) {
+            instruction_val = Opp.random_instruction(display, lcd);
+            display.drawCircle(lcd); 
+            button_val = Opp.read_input(pad); 
+            pad.leds_off();  
+            if (button_val == instruction_val) {
+                Opp.Correct(pad);
+            } else {
+                Opp.Game_Over(pad, lcd); 
+                display.init();
+                pad.init();
+                starter(); 
+        }
     }
+    
 }
 void starter() {