Diff: main.cpp

Revision:

6:0bc6813fe434

Parent:

5:331b65d1d280

Child:

9:192ad897ec95

diff -r 331b65d1d280 -r 0bc6813fe434 main.cpp
--- a/main.cpp	Thu Apr 11 09:44:12 2019 +0000
+++ b/main.cpp	Thu Apr 11 12:51:57 2019 +0000
@@ -43,60 +43,59 @@
     int fps = 8;  // frames per second
     init();     // initialise and then display welcome screen...
     welcome();  // waiting for the user to start
-    render();  // first draw the initial frame 
+    render();  // first draw the initial frame
     wait(1.0f/fps);  // and wait for one frame period
-    
+
     // game loop - read input, update the game state and render the display
     while (1) {
-  
-   lcd.clear(); 
-   
-                 int a = copter.GameOver();
-                 if(a == 1)
-                 {   a=0;
-                     lcd.clear();
-                     lcd.printString("GAME OVER", 10,1);
-                     lcd.refresh();
-                     int h=0;
-                     for(h=1; h<=500; h++){
-                     pad.tone(h,0.5);
-                     }
-                     
-                     wait(1.0);
-                     lcd.printString("PRESS BACK" ,13,3);
-                     lcd.printString("RESTART",20,4);
-                     lcd.refresh();
-                       while (pad.check_event(Gamepad::BACK_PRESSED)== false) 
-                       {
-                                  
-                                  pad.leds_on();
-                                  wait(0.1);
-                       }
-                       
-                        init();
-                        welcome();
-                        
-                        render();
-                        wait(1.0f/fps);
-                 }
-    
+
+        lcd.clear();
+
+        int a = copter.GameOver();
+        if(a == 1) {
+            a=0;
+            lcd.clear();
+            lcd.printString("GAME OVER", 10,1);
+            lcd.refresh();
+            int h=0;
+            for(h=1; h<=500; h++) {
+                pad.tone(h,0.5);
+            }
+
+            wait(1.0);
+            lcd.printString("PRESS BACK",13,3);
+            lcd.printString("RESTART",20,4);
+            lcd.refresh();
+            while (pad.check_event(Gamepad::BACK_PRESSED)== false) {
+
+                pad.leds_on();
+                wait(0.1);
+            }
+
+            init();
+            welcome();
+
+            render();
+            wait(1.0f/fps);
+        }
+
         copter.read_input(pad);
         copter.update(pad);
-    
+
         render();
         wait(1.0f/fps);
-        
+
     }
-} 
+}
 
 // initialies all classes and libraries
 void init()
 {
-    // need to initialise LCD and Gamepad 
+    // need to initialise LCD and Gamepad
     lcd.init();
     pad.init();
-     
-   copter.init(COPTER_WIDTH,COPTER_HEIGHT,WALL_SIZE,COPTER_SPEED,WALL1_SIZE,WALL2_SIZE);
+
+    copter.init(COPTER_WIDTH,COPTER_HEIGHT,WALL_SIZE,COPTER_SPEED,WALL1_SIZE,WALL2_SIZE);
 
 }
 
@@ -104,19 +103,20 @@
 void render()
 {
     // clear screen, re-draw and refresh
-   lcd.clear();  
+    lcd.clear();
     copter.draw(lcd);
     lcd.refresh();
 }
 
 
-void welcome() {
+void welcome()
+{
     pad.leds_on();
     lcd.printString("COPTER", 25,1);
     lcd.printString("Press START ",10,3);
     lcd.printString("to Start ",20,5);
     lcd.refresh();
-    
+
     //print the symbal on the screen
     while ( pad.check_event(Gamepad::START_PRESSED) == false) {
         pad.leds_on();
@@ -146,7 +146,7 @@
         pad.tone(100,0.1);
         wait(0.2);
         pad.tone(50,0.1);
-        
+
     }
- 
+
 }
\ No newline at end of file