Changeset 6695 for code/branches/ai/src/orxonox/controllers/AIController.cc

Timestamp:

Apr 12, 2010, 4:18:12 PM (14 years ago)

Author:

solex

Message:

master now lists slaves

File:

• code/branches/ai/src/orxonox/controllers/AIController.cc (modified) (4 diffs)

code/branches/ai/src/orxonox/controllers/AIController.cc

@@ -50 +50 @@
     {
         if (this->state_ == MASTER) freeAllSlaves();
+        if (this->state_ == SLAVE) unregisterSlave();
+        this->slaves.clear();
     }
 
@@ -60 +62 @@
         {
 
+            //this->state_ = MASTER;
             // search master
-            random = rnd(maxrand);
-            if (random < 50 && (!this->target_))
+            //random = rnd(maxrand);
+            //if (random < 101 && (!this->target_))
                 this->searchNewMaster();
-
-
 
         }
@@ -78 +79 @@
             // command slaves
             this->commandSlaves();
+
             // search enemy
             random = rnd(maxrand);
@@ -130 +132 @@
                 this->aimAtTarget();
 
-            /*if (this->bHasTargetPosition_)
+            if (this->bHasTargetPosition_)
                 this->moveToTargetPosition();
-*/
+
             if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(1000) && this->isLookingAtTarget(Ogre::Math::PI / 20.0f))
                 this->getControllableEntity()->fire(0);
         }
 
-        if (this->state_==SLAVE)
+        if (this->state_ == SLAVE)
         {