Changeset 11174 for code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc

Timestamp:

Apr 21, 2016, 4:47:39 PM (9 years ago)

Author:

sagerj

Message:

everything beneath weaponmode changed to push/release - wm modified only need to implement timer/ticker

File:

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

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

@@ -276 +276 @@
     }
 
-    void NewHumanController::doFire(unsigned int firemode)
+    void NewHumanController::doPush(unsigned int firemode)
     {
         if (!this->controllableEntity_)
@@ -291 +291 @@
         else
         {
-            HumanController::doFire(firemode); //call for formationflight
+            HumanController::doPush(firemode); //call for formationflight
         }
     }