[Orxonox-commit 6312] r10969 - code/branches/campaignHS15/src/orxonox/controllers

[gania at orxonox.net]

Author: gania
Date: 2015-12-11 15:20:17 +0100 (Fri, 11 Dec 2015)
New Revision: 10969

Modified:
   code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc
Log:
follow-up commit

Modified: code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc	2015-12-11 14:16:48 UTC (rev 10968)
+++ code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc	2015-12-11 14:20:17 UTC (rev 10969)
@@ -150,7 +150,6 @@
                 return;
             if (!this->bDodge_)
             {
-                // orxout(internal_error) << "attacking" << endl;
                 this->bStartedDodging_ = false;
 
                 this->setTargetPosition(this->positionOfTarget_ - diffUnit * 50.0f);   
@@ -158,7 +157,6 @@
             }
             else if (bTargetIsLookingAtThis || diffLength < 700.0f)
             {
-                // orxout(internal_error) << "dodging" << endl;
                 if (!this->bStartedDodging_)
                 {
                     this->bStartedDodging_ = true;
@@ -169,14 +167,12 @@
             {
                 if (diffLength < 1000)
                 {
-                // orxout(internal_error) << "looking" << endl;                    
                     this->stopMoving();
                     this->startLookingAtTarget();
 
                 }
                 else
                 {
-                // orxout(internal_error) << "closing up" << endl;                    
                     this->setTargetPosition(this->positionOfTarget_ - diffUnit * 300.0f);
                 }
             }
@@ -353,14 +349,13 @@
                         // SubclassIdentifier<Munition> munition =  ClassByString(wName);
                         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();
                     }
                 }
                 if(weaponModes_.size())//at least one weapon detected
                     this->bSetupWorked = true;
-            }//pawn->weaponSystem_->getMunition(SubclassIdentifier< Munition > *identifier)->getNumMunition (WeaponMode *user);
+            }
         }
 
     }