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

Timestamp:

Feb 15, 2012, 11:51:58 PM (13 years ago)

Author:

jo

Message:

Merging presentation2011 branch to trunk. Please check for possible bugs.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/HumanController.h (modified) (4 diffs)

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

@@ -34 +34 @@
 #include "tools/Timer.h"
 #include "tools/interfaces/Tickable.h"
-#include "Controller.h"
+#include "FormationController.h"
 
 // tolua_begin
@@ -41 +41 @@
     class _OrxonoxExport HumanController
 // tolua_end
-        : public Controller, public Tickable
+        : public FormationController, public Tickable
     { // tolua_export
         public:
@@ -74 +74 @@
             void keepBoosting(void);
             void terminateBoosting(void);
-            
+                  
+
             static void greet();
             static void switchCamera();
@@ -84 +85 @@
             static void toggleGodMode();
             static void myposition();
+
+            static void toggleFormationFlight();
+            static void FFChangeMode();
+            virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
+
 
             static void addBots(unsigned int amount);