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

Timestamp:

Jul 5, 2006, 4:39:02 PM (18 years ago)

Author:

bensch

Message:

merged the presentation back

File:

• trunk/src/world_entities/playable.cc (modified) (4 diffs)

trunk/src/world_entities/playable.cc

@@ -67 +67 @@
   this->bDead = false;
 
-  //subscribe to collision reaction
-  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 
   registerVar( new SynchronizeableInt( &score, &score, "score" ) );
@@ -393 +391 @@
   PRINTF(0)("Playable respawn\n");
   // only if this is the spaceship of the player
-  if( this == State::getPlayer()->getPlayable())
+  if( State::getGameRules() && State::getPlayer() && this == State::getPlayer()->getPlayable())
     State::getGameRules()->onPlayerSpawn();
 
@@ -403 +401 @@
 
 
-void Playable::destroy()
-{
-  Explosion::explode(dynamic_cast<PNode*>(this), Vector(1.0f, 1.0f, 1.0f));
-
-
+void Playable::destroy(WorldEntity* killer)
+{
   if( !this->bDead)
   {
@@ -416 +411 @@
       if( this == State::getPlayer()->getPlayable())
         State::getGameRules()->onPlayerDeath();
-
-      //     this->toList(OM_GROUP_05);
-      //HACK: moves the entity to an unknown place far far away: in the future, GameRules will look for that
-      this->setAbsCoor(-2000.0, -2000.0, -2000.0);
-
-      //explosion hack
-
     }
     this->bDead = true;
+    
+    if( State::getGameRules() != NULL)
+      State::getGameRules()->registerKill(Kill(killer, this));
   }
 }