Changeset 6142 in orxonox.OLD for trunk/src/world_entities/weapons/guided_missile.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/weapons/guided_missile.cc (modified) (3 diffs)

trunk/src/world_entities/weapons/guided_missile.cc

@@ -85 +85 @@
 void GuidedMissile::activate()
 {
-  State::getWorldEntityList()->add(this);
   if (unlikely(GuidedMissile::trailParticles == NULL))
   {
@@ -129 +128 @@
   this->lifeCycle = 0.0;
 
-//  GarbageCollector::getInstance()->collect(this);
-  State::getWorldEntityList()->remove(this);
+  this->toList(OM_DEAD);
   this->removeNode();
   GuidedMissile::fastFactory->kill(this);
@@ -152 +150 @@
   if (this->target != NULL && this->target->getParent() != PNode::getNullParent())
    {
-     printf("========%s::%s\n", target->getParent()->getClassName(), target->getParent()->getName() );
      velocity += ((target->getAbsCoor() - this->getAbsCoor()).getNormalized())*agility;
      float speed = velocity.len();