Changeset 9256 for code/trunk

Timestamp:

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

Author:

landauf

Message:

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

Location:

code/trunk/src/orxonox/controllers

Files:

• FormationController.cc (modified) (1 diff)
• FormationController.h (modified) (1 diff)
• HumanController.cc (modified) (4 diffs)
• HumanController.h (modified) (3 diffs)

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

@@ -252 +252 @@
     }
 
-  void FormationController::removeFromFormation()
+    //used, when slaves are in DEFEND mode.
+    void FormationController::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)
+    {
+        if (!this->formationFlight_ || this->state_!=MASTER || this->formationMode_!=DEFEND) return;
+            this->masterAttacked(originator);
+    }
+
+    void FormationController::removeFromFormation()
     {
         if (this->state_ == SLAVE || this->myMaster_) // slaves can also be temporary free, so check if myMaster_ is set

code/trunk/src/orxonox/controllers/FormationController.h

@@ -96 +96 @@
            { return this->formationMode_; }
 
-    protected:
+      virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
+
+  protected:
       bool formationFlight_;
       bool passive_;

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)
     {

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

@@ -74 +74 @@
             void keepBoosting(void);
             void terminateBoosting(void);
-                  
+
 
             static void greet();
@@ -88 +88 @@
             static void toggleFormationFlight();
             static void FFChangeMode();
-            virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
-
 
             static void addBots(unsigned int amount);
@@ -108 +106 @@
             static HumanController* localController_s;
             bool controlPaused_;
-        
+
         private:
             bool boosting_; // Whether the HumanController is in boosting mode or not.