Changeset 11645 for code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.cc

Timestamp:

Dec 9, 2017, 1:29:44 PM (7 years ago)

Author:

vyang

Message:

Asteroids2DShip ist 3s immun, nachdem es von einem Asteroiden getroffen wurde. Das Raumschiff hat nun eine Waffe → Richtung der Projektile muss noch angepasst werden

File:

• code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.cc (modified) (1 diff)

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.cc

@@ -98 +98 @@
     {
 
-        orxout() << "touched" << endl; 
         Asteroids2DStone* stone = orxonox_cast<Asteroids2DStone*>(otherObject);       
-        if(stone != nullptr && (stone != lastStone || lastStone == nullptr))
+        if(stone != nullptr && !bImmune)
         {
             removeHealth(100); 
-            lastStone = stone;
-          
+            this->getGame()->addPoints(10);
+
+            //The ship will be immune for 3 seconds after it has been hit by an asteroid
+            bImmune = true;
+            isimmune.setTimer(3.0f, false, createExecutor(createFunctor(&Asteroids2DShip::toggleImmune, this)));
+            orxout()<< "touched" << endl;
         }
         return false;