Changeset 6436 in orxonox.OLD for trunk/src

Timestamp:

Jan 8, 2006, 2:27:29 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: collides with function now takes away the Energy of our beloved Entity

Location:

trunk/src/world_entities

Files:

• playable.cc (modified) (1 diff)
• playable.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)

trunk/src/world_entities/playable.cc

@@ -52 +52 @@
   // the reference to the Current Player is NULL, because we dont have one at the beginning.
   this->currentPlayer = NULL;
+}
+
+/**
+ * @brief helps us colliding Playables
+ */
+void Playable::collidesWith(WorldEntity* entity, const Vector& location)
+{
+  if (entity->isA(CL_PROJECTILE))
+    this->removeEnergy(entity->getEnergy());
+
+  // EXTREME HACK
+  if (this->getEnergy() == 0.0f)
+    this->deactivateNode();
 }
 

trunk/src/world_entities/playable.h

@@ -38 +38 @@
     void detachCamera();
 
+    virtual void collidesWith(WorldEntity* entity, const Vector& location);
     virtual void process(const Event &event) = 0;
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -269 +269 @@
 void SpaceShip::collidesWith(WorldEntity* entity, const Vector& location)
 {
+  Playable::collidesWith(entity, location);
   if (entity->isA(CL_TURRET_POWER_UP) && entity != ref)
   {