Changeset 6412 for code/branches/pickup2/src/orxonox/controllers/HumanController.h

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

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

code/branches/pickup2/src/orxonox/controllers/HumanController.h

@@ -35 +35 @@
 #include "Controller.h"
 
+// tolua_begin
 namespace orxonox
 {
-    class _OrxonoxExport HumanController : public Controller, public Tickable
-    {
+    class _OrxonoxExport HumanController
+// tolua_end
+        : public Controller, public Tickable
+    { // tolua_export
         public:
             HumanController(BaseObject* creator);
@@ -53 +56 @@
             static void rotateRoll(const Vector2& value);
 
+            virtual void frontback(const Vector2& value);
+            virtual void yaw(const Vector2& value);
+            virtual void pitch(const Vector2& value);
+
             static void fire(unsigned int firemode);
+            virtual void doFire(unsigned int firemode);
             static void reload();
 
@@ -66 +74 @@
 
             static void suicide();
+            static void toggleGodMode();
 
             static void addBots(unsigned int amount);
             static void killBots(unsigned int amount = 0);
+
+            static void pauseControl(); // tolua_export
+            static void resumeControl(); // tolua_export
+            virtual void doPauseControl() {};
+            virtual void doResumeControl() {};
 
             static inline HumanController* getLocalControllerSingleton()
@@ -76 +90 @@
             friend class Map;
 
-        private:
+        protected:
             static HumanController* localController_s;
-    };
-}
+            bool controlPaused_;
+    }; // tolua_export
+} // tolua_export
 
 #endif /* _HumanController_H__ */