Changeset 8778 in orxonox.OLD

Timestamp:

Jun 26, 2006, 1:05:42 AM (18 years ago)

Author:

patrick

Message:

trunk: test model die function reimplemented

Location:

trunk/src/world_entities

Files:

• test_entity.cc (modified) (2 diffs)
• test_entity.h (modified) (1 diff)
• world_entity.cc (modified) (2 diffs)

trunk/src/world_entities/test_entity.cc

@@ -107 +107 @@
   if( this->lastCollided != entity)
   {
-    this->dieHard();
+    this->destroy();
     this->lastCollided = entity;
 
@@ -117 +117 @@
 
 
-void TestEntity::dieHard()
+void TestEntity::destroy()
 {
   if( this->bDeath)

trunk/src/world_entities/test_entity.h

@@ -25 +25 @@
   void setAnim(int animationIndex, int animPlaybackMode);
 
-  void dieHard();
+  virtual void destroy();
 
   virtual void tick (float time);

trunk/src/world_entities/world_entity.cc

@@ -738 +738 @@
   this->decreaseHealth(damage);
 
-  PRINTF(0)("Hit me: %s now only %f/%f health\n", this->getClassName(), this->getHealth(), this->getHealthMax());
+  PRINTF(5)("Hit me: %s now only %f/%f health\n", this->getClassName(), this->getHealth(), this->getHealthMax());
 
   if( this->getHealth() > 0)
@@ -759 +759 @@
 void WorldEntity::destroy()
 {
-  PRINTF(0)("Destroy\n");
   this->toList(OM_DEAD);
 }