Changeset 8720 for code/branches/ai/src/orxonox/controllers/ArtificialController.cc

Timestamp:

Jun 30, 2011, 8:30:13 PM (14 years ago)

Author:

jo

Message:

Just a backup, before starting to update the ai branch.

File:

• code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) (5 diffs)

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

@@ -91 +91 @@
         this->numberOfWeapons = 0;
         this->botlevel_ = 1.0f;
-        this->mode_ = DEFAULT;
+        this->mode_ = DEFAULT;////Vector-implementation: mode_.push_back(DEFAULT);
         this->timeout_=0;
     }
@@ -98 +98 @@
     {
         if (this->isInitialized())
-        {
+        {//Vector-implementation: mode_.erase(mode_.begin(),mode_.end());
             this->removeFromFormation();
 
@@ -1046 +1046 @@
             {//ROCKET: mid range weapon
                 //TODO: Which weapon is the rocket? How many rockets are available?
-                this->mode_ = ROCKET;
+                this->mode_ = ROCKET;//Vector-implementation: mode_.push_back(ROCKET);
                 this->getControllableEntity()->fire(3);//launch rocket
                 if(this->getControllableEntity()&&this->target_)//after fire(3) getControllableEntity() refers to the rocket!
@@ -1081 +1081 @@
                     else if(wpn=="LaserMunition")//other munitiontypes are not defined yet :-(
                         weapons[0]=0;
-                    else if(wpn=="LENSFLARE")//TODO: insert right munition name
+                    else if(wpn=="FusionMunition")
                         weapons[1]=1;
-                    else if(wpn=="SIMPLEROCKET")//TODO: insert right munition name
+                    else if(wpn=="TargetSeeking Rockets")
                         weapons[2]=2;
                     else if(wpn=="ROCKET")//TODO: insert right munition name
@@ -1133 +1133 @@
     void ArtificialController::setPreviousMode()
     {
-        this->mode_ = DEFAULT;
+        this->mode_ = DEFAULT; //Vector-implementation: mode_.pop_back();
     }