Diff: main.cpp

Revision:

37:90a0671d2ba7

Parent:

36:78efa0e7bd31

Child:

40:35f27f0e7833

--- a/main.cpp	Tue May 19 16:24:39 2020 +0000
+++ b/main.cpp	Mon May 25 14:15:50 2020 +0000
@@ -9,7 +9,6 @@
 Student ID Number: 201291390
 Date: 11.03.2020
 */
-
 // includes
 #include "mbed.h"
 #include "Gamepad.h"
@@ -74,28 +73,29 @@
     draw_game();
     wait(1.0f/_fps);
     
-while(1){
-    hardware_init();
-    game_init();
-    next_level(_level);
-    while(1) {
-        SpaceInvader.read_input(pad);
-        SpaceInvader.update(pad, lcd, _counter, _level);
-        draw_game();
-        wait(1.0f/_fps);
-        _counter++;
-        _ship_life = SpaceInvader.get_ship_life();
-        if(_ship_life == false){
-            game_over(_level);
-        }    
-        _armada_life = SpaceInvader.get_armada_life(); 
-        if(_armada_life == false){
-            break;
+    while(1){
+        hardware_init();
+        game_init();
+        next_level(_level);
+        
+        while(1) {
+            SpaceInvader.read_input(pad);
+            SpaceInvader.update(pad, lcd, _counter, _level);
+            draw_game();
+            wait(1.0f/_fps);
+            _counter++;
+            _ship_life = SpaceInvader.get_ship_life();
+            if(_ship_life == false){
+                game_over(_level);
+            }    
+            _armada_life = SpaceInvader.get_armada_life(); 
+            if(_armada_life == false){
+                break;
+            }
         }
+        SpaceInvader.kill_all();
+        _level++;
     }
-    SpaceInvader.kill_all();
-    _level++;
-}
 }
 
 void start_menu() 
@@ -133,6 +133,7 @@
 void game_over(int level)
 {
     lcd.clear();
+    
     while(1){
         lcd.printString("   Game Over",0,0);  
         char buffer_[14];
@@ -152,25 +153,27 @@
     lcd.refresh();
     wait(2);
     lcd.clear();
-    }
+}
   
 void select_difficulty()
 {
     _difficulty = 1;
     bool select_ = false;
+    
     while(select_ == false){
         lcd.clear();
         lcd.printString("  Easy",0,0);
         lcd.printString("  Medium",0,2);
         lcd.printString("  Hard",0,4);
+        
         if(_difficulty == 1){
             lcd.drawRect(0,0,3,3,FILL_BLACK);
         }
         if(_difficulty == 2){
-            lcd.drawRect(0,20,3,3,FILL_BLACK);
+            lcd.drawRect(0,16,3,3,FILL_BLACK);
         }
         if(_difficulty == 3){
-            lcd.drawRect(0,40,3,3,FILL_BLACK);
+            lcd.drawRect(0,32,3,3,FILL_BLACK);
         }
         lcd.refresh();
         wait(1);