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

Timestamp:

Dec 7, 2017, 6:25:56 PM (7 years ago)

Author:

vyang

Message:

Problem, dass Leben mehrmals durch einen Asteroiden abgezogen wird, wurde behoben

File:

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

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

@@ -97 +97 @@
     inline bool Asteroids2DShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
-        removeHealth(100);
-        getGame()->addPoints(10);
+
+        orxout() << "touched" << endl; 
+        Asteroids2DStone* stone = orxonox_cast<Asteroids2DStone*>(otherObject);       
+        if(stone != nullptr && (stone != lastStone || lastStone == nullptr))
+        {
+            removeHealth(100); 
+            lastStone = stone;
+          
+        }
         return false;
     }