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

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.h (modified) (3 diffs)

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.