Changeset 6173 in orxonox.OLD

Timestamp:

Dec 20, 2005, 1:57:33 AM (18 years ago)

Author:

bensch

Message:

christmas: aiming works again

File:

• branches/christmas_branche/src/world_entities/weapons/aim.cc (modified) (1 diff)

branches/christmas_branche/src/world_entities/weapons/aim.cc

@@ -104 +104 @@
 void Aim::searchTarget(float range)
 {
-  //FIXME//
-/*  tIterator<WorldEntity>* iterator = State::getWorldEntityList()->getIterator();
-  WorldEntity* entity = iterator->firstElement();
-  while (likely(entity != NULL))
+  std::list<WorldEntity*>::iterator entity;
+
+  for (entity = State::getObjectManager()->getObjectList(OM_GROUP_00).begin();
+       entity != State::getObjectManager()->getObjectList(OM_GROUP_00).end();
+       entity ++)
   {
-    if (entity->isA(CL_NPC) && this->source->getAbsCoor().x < entity->getAbsCoor().x && (this->source->getAbsCoor() - entity->getAbsCoor()).len() < range)
+    if (this->source->getAbsCoor().x < (*entity)->getAbsCoor().x && (this->source->getAbsCoor() - (*entity)->getAbsCoor()).len() < range)
     {
-      if (this->getParent() != entity)
+      if (this->getParent() != (*entity))
       {
         this->anim->replay();
-        this->setParentSoft(entity, 5);
+        this->setParentSoft(*entity, 5);
+        return;
       }
-      delete iterator;
-      return;
     }
-    entity = iterator->nextElement();
   }
-
-  delete iterator;*/
 }