Changeset 10444 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jan 28, 2007, 3:24:19 PM (18 years ago)

Author:

snellen

Message:

…

File:

• trunk/src/world_entities/npcs/npc.cc (modified) (1 diff)

trunk/src/world_entities/npcs/npc.cc

@@ -64 +64 @@
     this->loadParams(root);
 
-  if( this->bAIEnabled)
+  if( this->bAIEnabled && ! this->entityTrack)
   {
     std::cout << "Team Number: " << teamNumber << "\n";
     std::cout << "Swarm Number:" << swarmNumber << "\n";
 
-    if( this->entityTrack)
+    AIEngine::getInstance()->addAI(teamNumber,swarmNumber,(WorldEntity*)this,maxSpeed,attackDistance);
+  }
+
+  this->bFire = false;
+  if( this->entityTrack)
       this->setParent(this->entityTrack->getTrackNode());
-    else
-      AIEngine::getInstance()->addAI(teamNumber,swarmNumber,(WorldEntity*)this,maxSpeed,attackDistance);
-  }
-
-  this->bFire = false;