Changeset 6365 for code/branches/presentation2/src

Timestamp:

Dec 16, 2009, 9:43:36 PM (15 years ago)

Author:

rgrieder

Message:

Fixed segfault (when hitting tab in main menu) and second mode problem in NewHumanController.
The mode fix is temporary because it triggers another minor bug with the game pad.

File:

• code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) (2 diffs)

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

@@ -258 +258 @@
 
         // Reset pitch and yaw rates
-        this->currentPitch_ = 0;
-        this->currentYaw_ = 0;
+        // TODO: Reactivate this to fix the game pad problem with 0 input
+        //this->currentPitch_ = 0;
+        //this->currentYaw_ = 0;
 
         HumanController::tick(dt);
@@ -480 +481 @@
     void NewHumanController::changeMode()
     {
-        if (NewHumanController::localController_s && NewHumanController::localController_s->controlMode_ == 0)
-        {
+        if (NewHumanController::localController_s)
+        {
+            if (NewHumanController::localController_s->controlMode_ == 0)
+            {
                 NewHumanController::localController_s->controlMode_ = 1;
                 NewHumanController::localController_s->hideArrows();
-        }
-        else
-            NewHumanController::localController_s->controlMode_ = 0;
+            }
+            else
+                NewHumanController::localController_s->controlMode_ = 0;
+        }
     }