Changeset 6159 for code/branches/presentation2/src/orxonox

Timestamp:

Nov 26, 2009, 2:09:40 PM (15 years ago)

Author:

rgrieder

Message:

Fixed bug in HumanController introduced with the virtual functions.

Location:

code/branches/presentation2/src/orxonox/controllers

Files:

• HumanController.cc (modified) (2 diffs)
• HumanController.h (modified) (2 diffs)

code/branches/presentation2/src/orxonox/controllers/HumanController.cc

@@ -95 +95 @@
     }
 
+    void HumanController::moveFrontBack(const Vector2& value)
+    {
+        if (HumanController::localController_s)
+            HumanController::localController_s->frontback(value);
+    }
+
     void HumanController::frontback(const Vector2& value)
     {
@@ -137 +143 @@
     }
 
+    void HumanController::rotateYaw(const Vector2& value)
+    {
+        if (HumanController::localController_s)
+            HumanController::localController_s->yaw(value);
+    }
+
+    void HumanController::rotatePitch(const Vector2& value)
+    {
+        if (HumanController::localController_s)
+            HumanController::localController_s->pitch(value);
+    }
+
     void HumanController::rotateRoll(const Vector2& value)
     {
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
             HumanController::localController_s->controllableEntity_->rotateRoll(value);
+    }
+
+    void HumanController::fire(unsigned int firemode)
+    {
+        if (HumanController::localController_s)
+            HumanController::localController_s->doFire(firemode);
     }
 

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

@@ -45 +45 @@
             virtual void tick(float dt);
 
-            static void moveFrontBack(const Vector2& value){ HumanController::localController_s->frontback(value); }
+            static void moveFrontBack(const Vector2& value);
             static void moveRightLeft(const Vector2& value);
             static void moveUpDown(const Vector2& value);
 
-            static void rotateYaw(const Vector2& value){ HumanController::localController_s->yaw(value); }
-            static void rotatePitch(const Vector2& value){ HumanController::localController_s->pitch(value); }
+            static void rotateYaw(const Vector2& value);
+            static void rotatePitch(const Vector2& value);
             static void rotateRoll(const Vector2& value);
 
@@ -57 +57 @@
             virtual void pitch(const Vector2& value);
 
-            static void fire(unsigned int firemode) { HumanController::localController_s->doFire(firemode); }
+            static void fire(unsigned int firemode);
             virtual void doFire(unsigned int firemode);
             static void reload();