Changeset 6142 in orxonox.OLD for trunk/src/world_entities/test_entity.cc

Timestamp:

Dec 16, 2005, 7:13:57 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merge the ObjectManager to the trunk
merged with command:
svn merge -r6082:HEAD objectmanager/ ../trunk/

conflicts resolution was easy this time
but specially merged the world to network_world

File:

• trunk/src/world_entities/test_entity.cc (modified) (2 diffs)

trunk/src/world_entities/test_entity.cc

@@ -33 +33 @@
 {
   this->setClassID(CL_TEST_ENTITY, "TestEntity");
+  // TO SOME LIST!!
 
   this->md2Model = new MD2Model("models/droidika.md2", "models/droideka.pcx");
@@ -70 +71 @@
     PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getName(), entity->getName(), location.x, location.y, location.z);
   this->setVisibiliy(false);
-  State::getWorldEntityList()->remove(this);
+  this->toList(OM_DEAD);
   }
 }