Changeset 7071 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Feb 7, 2006, 2:58:08 PM (18 years ago)

Author:

patrick

Message:

patches: network load level and md2 death

Location:

trunk/src/world_entities

Files:

• creatures/md2_creature.cc (modified) (1 diff)
• test_entity.cc (modified) (2 diffs)
• test_entity.h (modified) (3 diffs)

trunk/src/world_entities/creatures/md2_creature.cc

@@ -226 +226 @@
 {
   PRINTF(0)("Collided with the md2 model\n");
-  //entity->die();
 }
 

trunk/src/world_entities/test_entity.cc

@@ -76 +76 @@
 
 
-void  TestEntity::setAnim(int animationIndex)
+void  TestEntity::setAnim(int animationIndex, int animPlaybackMode)
 {
   if( likely(this->getModel(0) != NULL))
-    ((MD2Model*)this->getModel(0))->setAnim(animationIndex);
+    ((MD2Model*)this->getModel(0))->setAnim(animationIndex, animPlaybackMode);
 }
 
@@ -92 +92 @@
 
 void TestEntity::collidesWith(WorldEntity* entity, const Vector& location)
-{}
+{
+  if( this->lastCollided != entity)
+  {
+    this->dieHard();
+    this->lastCollided = entity;
+  }
+}
 
 
+
+void TestEntity::dieHard()
+{
+  this->setAnim(DEATH_FALLBACK, MD2_ANIM_ONCE);
+}
+

trunk/src/world_entities/test_entity.h

@@ -11 +11 @@
 class Material;
 class TiXmlElement;
+class WorldEntity;
 
 class TestEntity : public WorldEntity, public PhysicsInterface
@@ -24 +25 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  void setAnim(int animationIndex);
+  void setAnim(int animationIndex, int animPlaybackMode);
 
   void dieHard();
@@ -37 +38 @@
   Material* material;
 
+  WorldEntity* lastCollided;
+
 };