[Orxonox-commit 4696] r9367 - code/branches/release2012/src/orxonox/controllers

[jo at orxonox.net]

Author: jo
Date: 2012-09-04 09:39:04 +0200 (Tue, 04 Sep 2012)
New Revision: 9367

Modified:
   code/branches/release2012/src/orxonox/controllers/NewHumanController.cc
Log:
Disabling free aiming.

Modified: code/branches/release2012/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/release2012/src/orxonox/controllers/NewHumanController.cc	2012-09-02 20:54:30 UTC (rev 9366)
+++ code/branches/release2012/src/orxonox/controllers/NewHumanController.cc	2012-09-04 07:39:04 UTC (rev 9367)
@@ -50,7 +50,7 @@
 
 namespace orxonox
 {
-    SetConsoleCommand("NewHumanController", "changeMode", &NewHumanController::changeMode).keybindMode(KeybindMode::OnPress);
+    SetConsoleCommand("NewHumanController", "changeMode", &NewHumanController::changeMode).keybindMode(KeybindMode::OnPress); //disabling free aiming
     SetConsoleCommand("NewHumanController", "accelerate", &NewHumanController::accelerate).keybindMode(KeybindMode::OnPress);
     SetConsoleCommand("NewHumanController", "decelerate", &NewHumanController::decelerate).keybindMode(KeybindMode::OnPress);
     SetConsoleCommand("NewHumanController", "unfire",     &NewHumanController::unfire    ).keybindMode(KeybindMode::OnRelease).addShortcut();
@@ -481,7 +481,7 @@
 
     void NewHumanController::changeMode()
     {
-        if (NewHumanController::localController_s)
+        /*if (NewHumanController::localController_s)
         {
             if (NewHumanController::localController_s->controlMode_ == 0)
             {
@@ -490,7 +490,7 @@
             }
             else
                 NewHumanController::localController_s->controlMode_ = 0;
-        }
+        }*/ //BRUTE FORCE: Turn off free aiming
     }
 
     void NewHumanController::changedControllableEntity()