Changeset 8758 for code/branches/ai2/src/orxonox/controllers/ArtificialController.cc

Timestamp:

Jul 14, 2011, 10:29:18 PM (13 years ago)

Author:

jo

Message:

Code clean up.

File:

• code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) (3 diffs)

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

@@ -317 +317 @@
         if (!this->getControllableEntity())
             this->removeFromFormation();
+        this->bSetupWorked = false;        // reset weapon information
+        this->numberOfWeapons = 0;
+        COUT(0)<<"ArtificialController::changedControllableEntity()"<<endl; //why is this function called more than once ??
     }
 
@@ -1135 +1138 @@
     {
         int max=10, i=0, j=0, k=0;
-        if(!pawn) {COUT(0)<<"NO PAWN"<<std::endl; return;}
+        if(!pawn) return;
         while(i<max)
         {
@@ -1151 +1154 @@
                     k++;
                     if(wMode==NULL) continue;
-                    COUT(0)<<wMode->getName()<<": weaponpack "+multi_cast<std::string>(i-1)<<", weapon "<<multi_cast<std::string>(j-1)<<", weaponmode "<<multi_cast<std::string>(k-1)<<std::endl;
+                    COUT(0)<<wMode->getIdentifier()->getName()<<": weaponpack "+multi_cast<std::string>(i-1)<<", weapon "<<multi_cast<std::string>(j-1)<<", weaponmode "<<multi_cast<std::string>(k-1)<<std::endl;
                 }
             }