Changeset 8758

Timestamp:

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

Author:

jo

Message:

Code clean up.

Location:

code/branches/ai2/src

Files:

• modules/weapons/weaponmodes/FusionFire.cc (modified) (1 diff)
• orxonox/controllers/AIController.cc (modified) (4 diffs)
• orxonox/controllers/ArtificialController.cc (modified) (3 diffs)
• orxonox/controllers/Controller.cc (modified) (1 diff)
• orxonox/controllers/Controller.h (modified) (2 diffs)
• orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/branches/ai2/src/modules/weapons/weaponmodes/FusionFire.cc

@@ -52 +52 @@
 
         this->setMunitionName("FusionMunition");
-        this->setName("FUSION_FIRE");
     }
 

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

@@ -196 +196 @@
                     this->bShooting_ = false;
 
+                //boost
+                random = rnd(maxrand);
+                if (random < botlevel_*100 )
+                    this->boostControl(); //TEST
             }
         }
@@ -205 +209 @@
         if (!this->isActive())
             return;
-        if(this->bDeathFlag_)//If a bot died recently, make him check his weaponsystem.
-        {
-            this->bSetupWorked = false;
-            this->numberOfWeapons = 0;
-            this->resetDeathFlag();
-        }
-        this->boostControl();//TEST
+
         float random;
         float maxrand = 100.0f / ACTION_INTERVAL;
@@ -229 +227 @@
                             random = rnd(maxrand);
                             if(this->botlevel_*100 > random)
-                                this->follow();//If a bot is shooting a player, it shouldn't let him go away easily.
+                                this->follow();  //If a bot is shooting a player, it shouldn't let him go away easily.
                         }
                     }
@@ -277 +275 @@
         else if (this->mode_ == ROCKET)//Rockets do not belong to a group of bots -> bot states are not relevant.
         {   //Vector-implementation: mode_.back() == ROCKET;
-            ControllableEntity *controllable = this->getControllableEntity(); 
+            ControllableEntity *controllable = this->getControllableEntity();
             if(controllable)
             {

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;
                 }
             }

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

@@ -42 +42 @@
         this->controllableEntity_ = 0;
         this->bGodMode_ = false;
-        this->bDeathFlag_ = false;
     }
 

code/branches/ai2/src/orxonox/controllers/Controller.h

@@ -63 +63 @@
             inline ControllableEntity* getControllableEntity() const
                 { return this->controllableEntity_; }
-            inline void setDeathFlag()
-                { this->bDeathFlag_ = true; }
-            inline void resetDeathFlag()
-                { this->bDeathFlag_ = false; }
             virtual void changedControllableEntity() {}
 
@@ -83 +79 @@
             PlayerInfo* player_;
             ControllableEntity* controllableEntity_;
-            bool bDeathFlag_; //<! Signal, when a controlled entity died. Flag is set in Pawn.cc and used in AIController.
         private:
             bool bGodMode_;

code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.cc

@@ -94 +94 @@
 
         this->isHumanShip_ = this->hasLocalController();
-        
+
         this->setSyncMode(ObjectDirection::Bidirectional); // needed to synchronise e.g. aimposition
     }
@@ -304 +304 @@
         if (this->getGametype() && this->getGametype()->allowPawnDeath(this, this->lastHitOriginator_))
         {
-            if ( this->getController()&& (!this->isHumanShip_) ) //announce death to the ai
-            {
-                 this->getController()->setDeathFlag();
-            }
             // Set bAlive_ to false and wait for PawnManager to do the destruction
             this->bAlive_ = false;