Changeset 10763 for code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc

Timestamp:

Nov 3, 2015, 5:06:05 PM (9 years ago)

Author:

gania

Message:

fixed a bug

File:

• code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified) (2 diffs)

code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc

@@ -58 +58 @@
         this->divisions_.clear();
         
-        /*for (ObjectList<DivisionController>::iterator it = ObjectList<DivisionController>::begin(); it; ++it)
+        for (ObjectList<DivisionController>::iterator it = ObjectList<DivisionController>::begin(); it; ++it)
         {
             if ((this->getControllableEntity()->getTeam() == (it)->getControllableEntity()->getTeam()))
@@ -65 +65 @@
             } 
         }
+        /*for(std::vector<WeakPtr<DivisionController> >::iterator it2 = divisions_.begin(); it2 != divisions_.end(); ++it2) 
+        {
+            (*it2)->setTargetPosition(this->getControllableEntity()->getWorldPosition());   
+        }*/ 
         for (ObjectList<Controller>::iterator it = ObjectList<Controller>::begin(); it; ++it)
         {
-            if ((this->getControllableEntity()->getTeam() != (it)->getControllableEntity()->getTeam()) && (it)->getControllableEntity()->getTeam() != 0)
+            if ((this->getControllableEntity()->getTeam() != (it)->getControllableEntity()->getTeam()) && (it)->getControllableEntity()->getTeam() == 0)
             {
                 for(std::vector<WeakPtr<DivisionController> >::iterator it2 = divisions_.begin(); it2 != divisions_.end(); ++it2) {
                     (*it2)->setTarget(it->getControllableEntity());   
+                    (*it2)->setTargetPosition(it->getControllableEntity()->getWorldPosition());
                 }               
                 break;
             } 
-        }*/
+        }
 
     }