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

Timestamp:

Jun 22, 2006, 3:14:58 PM (19 years ago)

Author:

bensch

Message:

merged the bsp-model-stuff back here

File:

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

trunk/src/world_entities/playable.cc

@@ -65 +65 @@
 
   this->bDead = false;
-
+  
   this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 
@@ -376 +376 @@
     if (this->getHealth() <= 0.0f)
     {
-      this->die();
+//       this->destory();
 
       if( State::getGameRules() != NULL)
@@ -411 +411 @@
 
 
-void Playable::die()
+
+void Playable::destroy()
 {
   Explosion::explode(dynamic_cast<PNode*>(this), Vector(1.0f, 1.0f, 1.0f));