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

Timestamp:

Nov 20, 2017, 4:19:40 PM (6 years ago)

Author:

merholzl

Message:

colisson boxes and asteroidshapoeremoval

File:

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

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

@@ -51 +51 @@
 #include "core/command/ConsoleCommand.h"
 #include "worldentities/ExplosionPart.h"
-
+#include <vector>
 
 namespace orxonox
@@ -167 +167 @@
 
         if(c.r<=5)
-            newAsteroid->addTemplate(Asteroid5[rand()%6]);
+            newAsteroid->addTemplate(Asteroid5[rand()%NUM_ASTEROIDS]);
         else if(c.r<=10)
-            newAsteroid->addTemplate(Asteroid10[rand()%6]);
+            newAsteroid->addTemplate(Asteroid10[rand()%NUM_ASTEROIDS]);
         else if(c.r<=15)
-            newAsteroid->addTemplate(Asteroid15[rand()%6]);
+            newAsteroid->addTemplate(Asteroid15[rand()%NUM_ASTEROIDS]);
         else
-            newAsteroid->addTemplate(Asteroid20[rand()%6]);
+            newAsteroid->addTemplate(Asteroid20[rand()%NUM_ASTEROIDS]);
         
         newAsteroid->setPosition(Vector3(c.x, 0, c.y));
@@ -207 +207 @@
     }
 
-    void FlappyOrx::comboControll()
-    {
-        if (b_combo)
-            multiplier++;
-        // if no combo was performed before, reset multiplier
-        else
-            multiplier = 1;
-        b_combo = false;
-    }
-
     void FlappyOrx::start()
     {
@@ -231 +221 @@
         Deathmatch::start();
     }
-    void FlappyOrx::addPoints(int numPoints)
-    {
-        if (!bEndGame)
-        {
-            point += numPoints * multiplier;
-            b_combo = true;
-        }
-    }
+
 
     void FlappyOrx::death(){
         bIsDead = true;
         
-        if(point<10)        sDeathMessage = DeathMessage10[rand()%(sizeof(DeathMessage10)/sizeof(*DeathMessage10))];
-        else if(point<30)   sDeathMessage = DeathMessage30[rand()%(sizeof(DeathMessage30)/sizeof(*DeathMessage30))];
-        else if(point<50)   sDeathMessage = DeathMessage50[rand()%(sizeof(DeathMessage50)/sizeof(*DeathMessage50))];
-        else                sDeathMessage = DeathMessageover50[rand()%(sizeof(DeathMessageover50)/sizeof(*DeathMessageover50))];
+        if(point<10)        sDeathMessage = DeathMessage10[rand()%(DeathMessage10.size())];
+        else if(point<30)   sDeathMessage = DeathMessage30[rand()%(DeathMessage30.size())];
+        else if(point<50)   sDeathMessage = DeathMessage50[rand()%(DeathMessage50.size())];
+        else                sDeathMessage = DeathMessageover50[rand()%(DeathMessageover50.size())];
         
         orxout()<<"message: "<<sDeathMessage<<std::endl;