Changeset 8948 for code/branches/formation/src/orxonox/controllers/Masterable.cc

Timestamp:

Nov 23, 2011, 4:06:18 PM (14 years ago)

Author:

willis

Message:

debugging

File:

• code/branches/formation/src/orxonox/controllers/Masterable.cc (modified) (6 diffs)

code/branches/formation/src/orxonox/controllers/Masterable.cc

@@ -59 +59 @@
   static const unsigned int STANDARD_MAX_FORMATION_SIZE = 7;
   static const int RADIUS_TO_SEARCH_FOR_MASTERS = 20000;
-  static const int FORMATION_LENGTH =  130;
+  static const int FORMATION_LENGTH =  110;
   static const int FORMATION_WIDTH =  110;
   static const int FREEDOM_COUNT = 4; //seconds the slaves in a formation will be set free when master attacks an enemy
@@ -86 +86 @@
         this->speedCounter_ = 0.2f;
         this->targetPosition_ = Vector3::ZERO;
-
+        //this->team_=-1;
         this->target_.setCallback(createFunctor(&Masterable::targetDied, this));
   }
@@ -319 +319 @@
                 if (distance < 40)
                 {
-                    this->getControllableEntity()->moveFrontBack(0.8f*SPEED_MASTER);
+                    this->getControllableEntity()->moveFrontBack(0.2f*SPEED_MASTER);
                    
                 } else this->getControllableEntity()->moveFrontBack(1.2f*SPEED_MASTER);
@@ -444 +444 @@
             this->state_ = MASTER;
             this->myMaster_ = 0;
+            orxout(debug_output) << "search new master: no master found, but teammates"<< endl;
         }
     }
@@ -588 +589 @@
         if (this->state_==FREE)
         {
-            float minDistance=RADIUS_TO_SEARCH_FOR_MASTERS;
+          /*
+            float minDistance=(float)RADIUS_TO_SEARCH_FOR_MASTERS;
             Masterable* bestMaster=NULL;
 
@@ -639 +641 @@
               this->slaves_.clear();
               this->myMaster_=0;
+              orxout(debug_output) << this << "no formation found!, empty formation"<< endl;
               return;
             }
-        }
-
-        if (this->state_==SLAVE)
-        {
+         */
+          searchNewMaster();
+        }
+
+        if (this->state_==SLAVE)  //become master of this formation
+        {   
             this->slaves_=myMaster_->slaves_;
             this->myMaster_->slaves_.clear();