Removed Bugs, made the program faster

GirlScript-Ireland · Aug 31, 2020 · 8472962 · 8472962
1 parent 60123d7
commit 8472962
Showing 1 changed file with 3 additions and 18 deletions.
diff --git a/Jo and Astha's team/Shreyash/Flappy_Birds/Flappy_Birds.pde b/Jo and Astha's team/Shreyash/Flappy_Birds/Flappy_Birds.pde
@@ -18,20 +18,9 @@ void setup(){
 }
 
 void draw(){
-
-  //String menu = "Press Space To Start";
-  //PFont z= createFont("impact",50);
-  //textFont(z);
-  //fill(#FF1212);
-  //text(menu,150,150);
-  //if(keyPressed&&key==' ')
-  //{
-  //  t=true;
-  //}
+
   if(ch)
   {
-    //if(t)
-    //{
       back(); 
     player.display();
     player.canvas();
@@ -77,16 +66,14 @@ void draw(){
       textFont(f);
       fill(0);
       text(s,600,20);
-<<<<<<< HEAD
+
     if(score==22)
     {
       power=true;
     }
-    if(power){
-=======
 
     if(score>=22){
->>>>>>> b157c01fadaed6a42a026eaa2cf4a1a1268d2f57
+
       PFont end = createFont("impact",30);
       String ss = "Press B To Activate Invincibility for 15 secs";
       fill(0);
@@ -134,8 +121,6 @@ void draw(){
       player.assend();
   }
 
-
-
 }
 
 void back(){