Changeset 9255 for code/trunk/src

Timestamp:

May 28, 2012, 12:21:45 AM (12 years ago)

Author:

landauf

Message:

fixed warnings in msvc
removed authorship for code that wasn't written by me

Location:

code/trunk/src/orxonox

Files:

• controllers/FormationController.cc (modified) (10 diffs)
• controllers/FormationController.h (modified) (1 diff)
• worldentities/ControllableEntity.h (modified) (1 diff)

code/trunk/src/orxonox/controllers/FormationController.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      ...
  *   Co-authors:
  *      Dominik Solenicki
@@ -61 +61 @@
   static const unsigned int STANDARD_MAX_FORMATION_SIZE = 9;
   static const int RADIUS_TO_SEARCH_FOR_MASTERS = 5000;
-  static const int FORMATION_LENGTH =  110;
-  static const int FORMATION_WIDTH =  110;
+  static const float FORMATION_LENGTH =  110;
+  static const float FORMATION_WIDTH =  110;
   static const int FREEDOM_COUNT = 4; //seconds the slaves in a formation will be set free when master attacks an enemy
   static const float SPEED_MASTER = 0.6f;
@@ -324 +324 @@
                 {   //linear speed reduction
                     this->getControllableEntity()->moveFrontBack(distance/100.0f*0.4f*SPEED_MASTER);
-                   
+
                 } else this->getControllableEntity()->moveFrontBack(1.2f*SPEED_MASTER);
 
@@ -383 +383 @@
     void FormationController::searchNewMaster()
     {
-        if (this->state_==SLAVE) 
+        if (this->state_==SLAVE)
            return;
         if (!this->getControllableEntity())
@@ -394 +394 @@
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
         {
-           
+
             //same team?
             Gametype* gt=this->getGametype();
@@ -479 +479 @@
                  bool left=true;
             int i = 1;
-            
+
             for(std::vector<FormationController*>::iterator it = slaves_.begin(); it != slaves_.end(); it++)
             {
@@ -490 +490 @@
                     i++;
                     dest+=FORMATION_LENGTH*(orient*WorldEntity::BACK);
-                }               
+                }
                 (*it)->setTargetOrientation(orient);
                 (*it)->setTargetPosition(pos);
@@ -599 +599 @@
 
         if (this->state_==SLAVE)  //become master of this formation
-        {   
+        {
             this->slaves_=this->myMaster_->slaves_;
             this->myMaster_->slaves_.clear();
             this->myMaster_->state_=SLAVE;
             this->myMaster_->myMaster_=this;
-            
+
             //delete myself in slavelist
             std::vector<FormationController*>::iterator it2 = std::find(this->slaves_.begin(), this->slaves_.end(), this);
@@ -647 +647 @@
            if (i>=slaves_.size()/2) break; //half the formation should attack.
        }
-    }     
+    }
 
 
@@ -860 +860 @@
     void FormationController::setTargetOrientation(const Quaternion& orient)
     {
-        this->targetOrientation_=orient;        
+        this->targetOrientation_=orient;
         this->bHasTargetOrientation_=true;
     }

code/trunk/src/orxonox/controllers/FormationController.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      ...
  *   Co-authors:
  *      ...

code/trunk/src/orxonox/worldentities/ControllableEntity.h

@@ -166 +166 @@
             inline void setTeam(int team)
                 { this->team_ = team; }
-            inline float getTeam() const
+            inline int getTeam() const
                 { return this->team_; }