Changeset 11643 for code/branches/Asteroid_HS17

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

Location:

code/branches/Asteroid_HS17/src/modules/asteroids2D

Files:

• Asteroids2DShip.cc (modified) (1 diff)
• Asteroids2DShip.h (modified) (2 diffs)

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;
     }

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

@@ -38 +38 @@
 #include "asteroids2D/Asteroids2DPrereqs.h"
 
+
 #include "core/XMLPort.h"
 #include "worldentities/pawns/SpaceShip.h"
+#include "weapons/WeaponsPrereqs.h"
 #include "graphics/Camera.h"
 
 #include "Asteroids2D.h" // Is necessary for getGame function
 //#include "Asteroids2DCenterPoint.h"
+#include "Asteroids2DStone.h"
 
 #include "tools/Timer.h"
@@ -80 +83 @@
         private:
             Asteroids2D* getGame();
+
             float width, height;
             WeakPtr<Asteroids2D> game;
-            WeakPtr<WorldEntity> lastEntity;
-            struct Velocity
-            {
-                float x;
-                float y;
-            } velocity, desiredVelocity;
+            WeakPtr<Asteroids2DStone> lastStone;
 
             Timer timer;