Changeset 10244 in orxonox.OLD for branches/ai/src/ai/ai_engine.cc

Timestamp:

Jan 17, 2007, 12:43:30 AM (17 years ago)

Author:

tfahrni

Message:

tired

File:

• branches/ai/src/ai/ai_engine.cc (modified) (1 diff)

branches/ai/src/ai/ai_engine.cc

@@ -30 +30 @@
         for (it=teams.begin(); it!= teams.end(); it++ )
         {
-                //find enemys for the team
-                for(ObjectList<NPC2>::const_iterator npc = NPC2::objectList().begin(); npc != NPC2::objectList().end(); ++npc)
-                        if((*npc)->getTeam() != it->first)enemyList->push_back(*npc);
-
                 //add player to enemys (player belongs to team 0)
                 if(it->first!=0){
-                        //std::cout << "adding player to enemyList\n";
                         Player* pl = State::getPlayer();
                         if(pl != NULL)enemyList->push_back(pl->getPlayable());
                 }
+        
+                //find other enemys for this team
+                for(ObjectList<NPC2>::const_iterator npc = NPC2::objectList().begin(); npc != NPC2::objectList().end(); ++npc)
+                        if((*npc)->getTeam() != it->first)enemyList->push_back(*npc);
 
                 //process the team