Diff: main.cpp

Revision:

33:d8284dee58db

Parent:

24:ff5af5a013b5

Child:

34:853f0cf0ce03

--- a/main.cpp	Mon May 18 08:43:15 2020 +0000
+++ b/main.cpp	Mon May 18 14:57:30 2020 +0000
@@ -45,66 +45,66 @@
 void start_menu();
 void game_over(int level);
 void next_level(int level);
-//void update_game(UserInput input);
 void select_difficulty();
-
-int fps;
-int counter;
-int level;
-int difficulty;
-int number_of_aliens;
-bool armada_life;
-bool ship_life;
+//variables
+int _fps;
+int _counter;
+int _level;
+int _difficulty;
+int _number_of_aliens;
+bool _armada_life;
+bool _ship_life;
 
 Direction direction;
 
 int main()
 {
-    fps = 6;
-    counter = 0;
-    level = 1;
-    armada_life = true;
-    ship_life = true;
+    _fps = 6;
+    _counter = 0;
+    _level = 1;
+    _armada_life = true;
+    _ship_life = true;
     
     hardware_init();
     start_menu();
     select_difficulty();
     
-    number_of_aliens = 5*difficulty;
+    _number_of_aliens = 5*_difficulty;
     
     draw_game();
-    wait(1.0f/fps);
+    wait(1.0f/_fps);
     
 while(1){
     hardware_init();
     game_init();
-    next_level(level);
+    next_level(_level);
     while(1) {
         SpaceInvader.read_input(pad);
-        SpaceInvader.update(pad, lcd, counter, level);
+        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);
+        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){
+        _armada_life = SpaceInvader.get_armada_life(); 
+        if(_armada_life == false){
             break;
             }
     }
     SpaceInvader.kill_all();
-    level++;
+    _level++;
 }
 }
 
-void start_menu() {
+void start_menu() 
+{
     lcd.printString("Space Invaders",0,1);  
     lcd.printString("  Press Start ",0,4);
     lcd.refresh();
     
-    while ( pad.start_pressed() == false) {
+    while(pad.start_pressed() == false) {
         lcd.setContrast( pad.read_pot1());
         pad.leds_on();
         wait(0.1);
@@ -127,47 +127,51 @@
 }
 void game_init()
 {
-    SpaceInvader.init(SHIP_HEIGHT,SHIP_WIDTH,ALIEN_SIZE,number_of_aliens,COLUMN_SIZE,ROW_SIZE,COVER_Y,COVER1_X,COVER2_X,COVER3_X,ROCK_NUMBER,level);   
+    SpaceInvader.init(SHIP_HEIGHT,SHIP_WIDTH,ALIEN_SIZE,10,COLUMN_SIZE,ROW_SIZE,COVER_Y,COVER1_X,COVER2_X,COVER3_X,ROCK_NUMBER,_level);   
 }
 
-void game_over(int level){
+void game_over(int level)
+{
     lcd.clear();
     while(1){
         lcd.printString("   Game Over",0,0);  
-        char buffer[14];
-        sprintf(buffer,"   Level %2d",level);
-        lcd.printString(buffer,0,2);       
+        char buffer_[14];
+        sprintf(buffer_,"   Level %2d",level);
+        lcd.printString(buffer_,0,2);       
         lcd.printString("  Press reset ",0,4);
         lcd.refresh();
     }
 }
 
-void next_level(int level){
+void next_level(int level)
+{
     lcd.clear();
-    char buffer[14];
-    sprintf(buffer,"   Level %2d",level);
-    lcd.printString(buffer,0,2);
+    char buffer_[14];
+    sprintf(buffer_,"   Level %2d",level);
+    lcd.printString(buffer_,0,2);
+    printf("here1");
     lcd.refresh();
     wait(2);
     lcd.clear();
+    printf("here2");
     }
   
-void select_difficulty(){
-    difficulty = 1;
-    bool select = false;
-    
-    while(select == false){
+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){
+        if(_difficulty == 1){
             lcd.drawRect(0,0,3,3,FILL_BLACK);
         }
-        if(difficulty == 2){
+        if(_difficulty == 2){
             lcd.drawRect(0,20,3,3,FILL_BLACK);
         }
-        if(difficulty == 3){
+        if(_difficulty == 3){
             lcd.drawRect(0,40,3,3,FILL_BLACK);
         }
         lcd.refresh();
@@ -176,37 +180,37 @@
         while(1){    
             direction = pad.get_direction();
             if(pad.A_pressed()==true){
-                select = true;
+                select_ = true;
                 break;
                 }
-            if((difficulty==1)&&
+            if((_difficulty==1)&&
             (direction==N)){
-                difficulty = 3;
+                _difficulty = 3;
                 break;  
             }
-            if((difficulty==1)&&
+            if((_difficulty==1)&&
             (direction==S)){
-                difficulty = 2;
+                _difficulty = 2;
                 break;
             }
-            if((difficulty==2)&&
+            if((_difficulty==2)&&
             (direction==N)){
-                difficulty = 1; 
+                _difficulty = 1; 
                 break;  
             }
-            if((difficulty==2)&&
+            if((_difficulty==2)&&
             (direction==S)){
-                difficulty = 3;
+                _difficulty = 3;
                 break;
             }
-            if((difficulty==3)&&
+            if((_difficulty==3)&&
             (direction==N)){
-                difficulty = 2;
+                _difficulty = 2;
                 break;
             }
-            if((difficulty==3)&&
+            if((_difficulty==3)&&
             (direction==S)){
-                difficulty = 1;
+                _difficulty = 1;
                 break;
             }
         }