Changeset 10969 for code/branches/campaignHS15/src

Timestamp:

Dec 11, 2015, 3:20:17 PM (9 years ago)

Author:

gania

Message:

follow-up commit

File:

• code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) (6 diffs)

code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc

@@ -151 +151 @@
             if (!this->bDodge_)
             {
-                // orxout(internal_error) << "attacking" << endl;
                 this->bStartedDodging_ = false;
 
@@ -159 +158 @@
             else if (bTargetIsLookingAtThis || diffLength < 700.0f)
             {
-                // orxout(internal_error) << "dodging" << endl;
                 if (!this->bStartedDodging_)
                 {
@@ -170 +168 @@
                 if (diffLength < 1000)
                 {
-                // orxout(internal_error) << "looking" << endl;                    
                     this->stopMoving();
                     this->startLookingAtTarget();
@@ -177 +174 @@
                 else
                 {
-                // orxout(internal_error) << "closing up" << endl;                    
                     this->setTargetPosition(this->positionOfTarget_ - diffUnit * 300.0f);
                 }
@@ -354 +350 @@
                         if (wName == "RocketFire")
                             this->rocketsLeft_ = 10;
-                            // this->rocketsLeft_ = orxonox_cast<Pawn*>(this->getControllableEntity())->getWeaponSystem()->getMunition(&munition)->getNumMunitionInCurrentMagazine(wMode);
                         if(this->getFiremode(wName) == -1) //only add a weapon, if it is "new"
                             weaponModes_[wName] = wMode->getMode();
@@ -361 +356 @@
                 if(weaponModes_.size())//at least one weapon detected
                     this->bSetupWorked = true;
-            }//pawn->weaponSystem_->getMunition(SubclassIdentifier< Munition > *identifier)->getNumMunition (WeaponMode *user);
+            }
         }