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

Timestamp:

Jan 17, 2007, 4:53:23 PM (17 years ago)

Author:

tfahrni

Message:

fixed segfault

File:

• branches/ai/src/ai/ai_engine.cc (modified) (2 diffs)

branches/ai/src/ai/ai_engine.cc

@@ -33 +33 @@
                 if(it->first!=0){
                         Player* pl = State::getPlayer();
-                        if(pl != NULL)enemyList->push_back(pl->getPlayable());
+                        if( pl!=NULL && pl->getPlayable()!=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)
@@ -60 +61 @@
 void AIEngine::removeAI(int teamNumber, int swarmNumber, WorldEntity* npc)
 {
-        std::map<int,AITeam*>::iterator it = teams.find(swarmNumber);
+        std::map<int,AITeam*>::iterator it = teams.find(teamNumber);
         if(it==teams.end())return;
         it->second->removeAI(swarmNumber,npc);