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

Timestamp:

Dec 16, 2011, 8:36:41 PM (13 years ago)

Author:

jo

Message:

Merged Formation branch. There are still some bugs (just have a look at the tutorial level)

Location:

code/branches/presentation2011

Files:

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

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

@@ -277 +277 @@
     }
 
-    void NewHumanController::doFire(unsigned int firemode)
+    void NewHumanController::doFire(unsigned int firemode)//TODO??
     {
         if (!this->controllableEntity_)
@@ -297 +297 @@
     void NewHumanController::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)
     {
+        //Used in HumanController for formationFlight
+        HumanController::hit(originator,contactpoint,damage);
+        
         if (this->showDamageOverlay_ && !this->controlPaused_ && this->controllableEntity_ && !this->controllableEntity_->isInMouseLook())
         {