Changeset 9256 for code/trunk/src/orxonox/controllers/HumanController.cc

Timestamp:

May 28, 2012, 9:06:02 AM (12 years ago)

Author:

landauf

Message:

I think this implementation of the hit() function rather belongs to FormationController than to HumanController

File:

• code/trunk/src/orxonox/controllers/HumanController.cc (modified) (4 diffs)

code/trunk/src/orxonox/controllers/HumanController.cc

@@ -85 +85 @@
     HumanController::~HumanController()
     {
-        if (HumanController::localController_s) 
+        if (HumanController::localController_s)
         {
             HumanController::localController_s->removeFromFormation();
@@ -197 +197 @@
             HumanController::localController_s->keepBoosting();
     }
-    
+
     /**
     @brief
@@ -302 +302 @@
                 orxout(message) <<"FormationFlight enabled "<< endl;
             }
-            
+
         }
 
@@ -332 +332 @@
     }
 
-
-    //used, when slaves are in DEFEND mode.
-    void HumanController::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)
-    {
-        if (!this->formationFlight_ || this->state_!=MASTER || this->formationMode_!=DEFEND) return;
-            this->masterAttacked(originator);
-    }
-
     void HumanController::addBots(unsigned int amount)
     {