Changeset 11760 for code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc

Timestamp:

Feb 17, 2018, 11:50:25 PM (6 years ago)

Author:

landauf

Message:

[FlappyOrx_HS17] some cleanup

File:

• code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) (3 diffs)

code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc

@@ -142 +142 @@
 
         //Fill up triangle with asteroids
-        while(noadd<5&&circlesUsed<nCircles){
+        while(noadd<5&&circlesUsed<NUM_CIRCLES){
             if(slope>0)
                 newAsteroid.y=rnd(150+y)-150;   //create asteroid on bottom
@@ -187 +187 @@
     void FlappyOrx::clearCircles(){
         circlesUsed=0;
-        for(int i = 0; i<this->nCircles; i++){
+        for(int i = 0; i<NUM_CIRCLES; i++){
             circles[i].r=0;
         }
@@ -206 +206 @@
     int FlappyOrx::addIfPossible(Circle c){
         int i;
-        for(i=0; i<this->nCircles && this->circles[i].r!=0 && c.r>0;i++){
+        for(i=0; i<NUM_CIRCLES && this->circles[i].r!=0 && c.r>0;i++){
             while(circleCollision(c,this->circles[i])){
                 c.r-=5; //when it collides, try to make it smaller