Changeset 11208 for code/branches/presentationFS16/src/orxonox/controllers/NewHumanController.cc

Timestamp:

May 26, 2016, 4:53:34 PM (9 years ago)

Author:

fvultier

Message:

merged discharger, thats the last one

Location:

code/branches/presentationFS16

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/NewHumanController.cc (modified) (4 diffs)

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

@@ -54 +54 @@
     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();
 
     RegisterUnloadableClass(NewHumanController);
@@ -277 +276 @@
     }
 
-    void NewHumanController::doFire(unsigned int firemode)
+    void NewHumanController::doPush(unsigned int firemode)
     {
         if (!this->controllableEntity_)
@@ -291 +290 @@
         }
         else
-            HumanController::doFire(firemode); //call for formationflight
+        {
+            HumanController::doPush(firemode); //call for formationflight
+        }
+    }
+
+    void NewHumanController::doRelease(unsigned int firemode)
+    {
+        if (!this->controllableEntity_)
+            return;
+
+        this->firemode_ = firemode;
+
+        HumanController::doRelease(firemode); //call for formationflight
     }
 
@@ -342 +353 @@
             }
         }
-    }
-
-    void NewHumanController::unfire()
-    {
-        if (NewHumanController::localController_s)
-            NewHumanController::localController_s->doUnfire();
-    }
-
-    void NewHumanController::doUnfire()
-    {
-        this->firemode_ = -1;
-        hideArrows();
     }