Changeset 5779 in orxonox.OLD for trunk/src/world_entities/weapons/weapon_manager.cc

Timestamp:

Nov 26, 2005, 2:20:58 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: ClassList is now in std::list style
ShellCommand is now in std::list style

File:

• trunk/src/world_entities/weapons/weapon_manager.cc (modified) (3 diffs)

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -347 +347 @@
    if (this->targetIterator == NULL)
    {
-     tList<BaseObject>* npcList = ClassList::getList(CL_NPC);
+     std::list<BaseObject*>* npcList = ClassList::getList(CL_NPC);
      if (npcList != NULL)
      {
-       this->targetIterator = npcList->getIterator();
-       this->targetIterator->firstElement();
+       this->targetIterator = npcList->begin();
      }
      else
@@ -357 +356 @@
    }
 
-   PNode* retNode = dynamic_cast<PNode*>(targetIterator->nextElement());
-   if (retNode == NULL && this->targetIterator->getList()->getSize() > 0)
-     retNode =  dynamic_cast<PNode*>(targetIterator->firstElement());
+   ///FIXME
+//   this->targetIterator++;
+   PNode* retNode = dynamic_cast<PNode*>((*targetIterator));
+//   if (retNode == NULL && this->targetIterator->getList()->getSize() > 0)
+//     retNode =  dynamic_cast<PNode*>(targetIterator->firstElement());
 
    return retNode;
@@ -372 +373 @@
 PNode* WeaponManager::getDistanceTarget(const PNode* carrier, float distance)
 {
-  tList<BaseObject>* npcList = ClassList::getList(CL_NPC);
+  std::list<BaseObject*>* npcList = ClassList::getList(CL_NPC);
   if (npcList != NULL)
   {
-    tIterator<BaseObject>* npcIT = npcList->getIterator();
-    PNode* tmpNPC = dynamic_cast<PNode*>(npcIT->firstElement());
-    while (tmpNPC != NULL)
-    {
-      if ((carrier->getAbsCoor() - tmpNPC->getAbsCoor()).len() < distance)
-      {
-        delete npcIT;
-        return tmpNPC;
-      }
-      tmpNPC = dynamic_cast<PNode*>(npcIT->nextElement());
-    }
-    delete npcIT;
+    list<BaseObject*>::iterator node;
+    for (node= npcList->begin(); node != npcList->end(); node++)
+      if ((carrier->getAbsCoor() - dynamic_cast<PNode*>(*node)->getAbsCoor()).len() < distance)
+        return dynamic_cast<PNode*>(*node);
   }
   return this->getFixedTarget();
-
 }