Changeset 6966 in orxonox.OLD for trunk/src/world_entities/playable.cc

Timestamp:

Feb 1, 2006, 6:43:11 PM (20 years ago)

Author:

patrick

Message:

trunk: deactivated the lenseflare temp

File:

• trunk/src/world_entities/playable.cc (modified) (1 diff)

trunk/src/world_entities/playable.cc

@@ -126 +126 @@
 {
   if (entity->isA(CL_PROJECTILE) && !State::isOnline() )
+  {
     this->decreaseHealth(entity->getHealth());
-
-  // EXTREME HACK
-  if (this->getHealth() == 0.0f)
-  {
+    // EXTREME HACK
+    if (this->getHealth() == 0.0f)
+    {
+      this->die();
+    }
+  }
+}
+
+
+void Playable::die()
+{
     //this->deactivateNode();
-    this->emitter->setSystem(explosionParticles);
-    this->setAbsCoor(0, 0, 0);
+  this->toList(OM_DEAD);
+  this->emitter->setSystem(explosionParticles);
+  this->setAbsCoor(0, 0, 0);
     //this->setAbsDir(Vector(1,0,0), 0);
-    this->emitter->setSystem(NULL);
-  }
-}
+  this->emitter->setSystem(NULL);
+
+
+  if( this->getOwner()%2 == 0)
+    this->toList(OM_GROUP_00);
+  else
+    this->toList(OM_GROUP_01);
+}
+
 
 /**