Changeset 9005 for code/branches/presentation2011/src/orxonox/controllers/NewHumanController.cc

Timestamp:

Dec 19, 2011, 2:43:04 PM (12 years ago)

Author:

willis

Message:

fixed merging some merging bugs and some other bugs…

File:

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

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

@@ -277 +277 @@
     }
 
-    void NewHumanController::doFire(unsigned int firemode)//TODO??
+    void NewHumanController::doFire(unsigned int firemode)
     {
         if (!this->controllableEntity_)
@@ -291 +291 @@
         }
         else
-            HumanController::localController_s->getControllableEntity()->fire(firemode);
-
+            HumanController::doFire(firemode); //call for formationflight
     }