Changeset 11537 for code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc

Timestamp:

Nov 6, 2017, 3:32:04 PM (7 years ago)

Author:

pascscha

Message:

Death

File:

• code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc (modified) (6 diffs)

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

@@ -74 +74 @@
 
     void FlappyOrx::updatePlayerPos(int x){
+
         if(this->tubes.size()==0||x-this->tubes.back()-tubeOffsetX>spawnDistance){
             spawnTube();
@@ -82 +83 @@
             levelUp();
             point++;
+        }
+        while((this->asteroids.front())->getPosition().x<x-300){
+            MovableEntity* deleteMe = asteroids.front();
+            asteroids.pop();
+            deleteMe->destroy();
         }
     }
@@ -144 +150 @@
     }
 
+    void deleteAsteroid(MovableEntity* asteroid){
+        //center_->getContext().getObjectList().removeElement(asteroid);
+    }
+
     void FlappyOrx::createAsteroid(Circle &c){
         orxout() << "created Asteroid at x="<<c.x<<" y="<<c.y << std::endl;
+
         MovableEntity* newAsteroid = new MovableEntity(this->center_->getContext());
+
+
         if(c.r<=5)
             newAsteroid->addTemplate(Asteroid5[rand()%6]);
@@ -160 +173 @@
         newAsteroid->setOrientation(Vector3::UNIT_Y, Degree(rand()%360));
 
+        asteroids.push(newAsteroid);
+
+
     }
 
@@ -169 +185 @@
     void FlappyOrx::costLife()
     {
-        lives--;
-        multiplier = 1;
-        // end the game in 30 seconds.
-        if (lives <= 0)
-            enemySpawnTimer.setTimer(30.0f, false, createExecutor(createFunctor(&FlappyOrx::end, this)));
+        
     };
 
@@ -206 +218 @@
             point += numPoints * multiplier;
             b_combo = true;
+        }
+    }
+
+    void FlappyOrx::death(){
+        if (Highscore::exists()){
+                    int score = this->getPoints();
+                    if(score > Highscore::getInstance().getHighestScoreOfGame("Orxonox Arcade")) 
+                        Highscore::getInstance().storeHighscore("Orxonox Arcade",score);
+
+        }
+        point = 0;
+        while (!tubes.empty())
+        {
+            tubes.pop();
+        }
+        while (!asteroids.empty())
+        {
+            MovableEntity* deleteMe = asteroids.front();
+            asteroids.pop();
+            deleteMe->destroy();
         }
     }